diff options
-rw-r--r-- | include/linux/Kbuild | 2 | ||||
-rw-r--r-- | include/linux/futex.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index e618b25b5add..a1b04d8a1d01 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -61,7 +61,6 @@ header-y += fd.h | |||
61 | header-y += fdreg.h | 61 | header-y += fdreg.h |
62 | header-y += fib_rules.h | 62 | header-y += fib_rules.h |
63 | header-y += fuse.h | 63 | header-y += fuse.h |
64 | header-y += futex.h | ||
65 | header-y += genetlink.h | 64 | header-y += genetlink.h |
66 | header-y += gen_stats.h | 65 | header-y += gen_stats.h |
67 | header-y += gigaset_dev.h | 66 | header-y += gigaset_dev.h |
@@ -203,6 +202,7 @@ unifdef-y += fb.h | |||
203 | unifdef-y += fcntl.h | 202 | unifdef-y += fcntl.h |
204 | unifdef-y += filter.h | 203 | unifdef-y += filter.h |
205 | unifdef-y += flat.h | 204 | unifdef-y += flat.h |
205 | unifdef-y += futex.h | ||
206 | unifdef-y += fs.h | 206 | unifdef-y += fs.h |
207 | unifdef-y += gameport.h | 207 | unifdef-y += gameport.h |
208 | unifdef-y += generic_serial.h | 208 | unifdef-y += generic_serial.h |
diff --git a/include/linux/futex.h b/include/linux/futex.h index d097b5b72bc6..3f153b4e156c 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h | |||
@@ -93,6 +93,7 @@ struct robust_list_head { | |||
93 | */ | 93 | */ |
94 | #define ROBUST_LIST_LIMIT 2048 | 94 | #define ROBUST_LIST_LIMIT 2048 |
95 | 95 | ||
96 | #ifdef __KERNEL__ | ||
96 | long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout, | 97 | long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout, |
97 | u32 __user *uaddr2, u32 val2, u32 val3); | 98 | u32 __user *uaddr2, u32 val2, u32 val3); |
98 | 99 | ||
@@ -110,6 +111,7 @@ static inline void exit_pi_state_list(struct task_struct *curr) | |||
110 | { | 111 | { |
111 | } | 112 | } |
112 | #endif | 113 | #endif |
114 | #endif /* __KERNEL__ */ | ||
113 | 115 | ||
114 | #define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */ | 116 | #define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */ |
115 | #define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */ | 117 | #define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */ |