diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-12-10 05:19:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:55:41 -0500 |
commit | 58f64d83c37f5073a01573d27043c9c0ccc764f1 (patch) | |
tree | f49a00a30ef547f6c3809ad2cd8aa85c247c9722 /include/linux/futex.h | |
parent | 1f29bcd739972f71f2fd5d5d265daf3e1208fa5e (diff) |
[PATCH] Fix noise in futex.h
There are some kernel-only bits in the middle of <linux/futex.h> which
should be removed in what we export to userspace.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/futex.h')
-rw-r--r-- | include/linux/futex.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; */ |