Pull thinkpad-2.6.24 into release branch

[sfrench/cifs-2.6.git] / include / linux / futex.h

diff --git a/include/linux/futex.h b/include/linux/futex.h
index 99650353adfaeb5f1d0b195770faaa5469548cf9..92d420fe03f8173d072b1d8d03a7c51fdcef2125 100644 (file)
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -149,10 +149,6 @@ union futex_key {
                int offset;
        } both;
 };
-int get_futex_key(u32 __user *uaddr, struct rw_semaphore *shared,
-                 union futex_key *key);
-void get_futex_key_refs(union futex_key *key);
-void drop_futex_key_refs(union futex_key *key);
 
 #ifdef CONFIG_FUTEX
 extern void exit_robust_list(struct task_struct *curr);