Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 58f64d83c37f5073a01573d27043c9c0ccc764f1

Authored by David Woodhouse
Committed by Linus Torvalds
1 parent 1f29bcd739
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 2 changed files with 3 additions and 1 deletions Side-by-side Diff

include/linux/Kbuild
Diff comments   View file @ 58f64d8
... ... @@ -61,7 +61,6 @@
61 61 header-y += fdreg.h
62 62 header-y += fib_rules.h
63 63 header-y += fuse.h
64   -header-y += futex.h
65 64 header-y += genetlink.h
66 65 header-y += gen_stats.h
67 66 header-y += gigaset_dev.h
... ... @@ -203,6 +202,7 @@
203 202 unifdef-y += fcntl.h
204 203 unifdef-y += filter.h
205 204 unifdef-y += flat.h
  205 +unifdef-y += futex.h
206 206 unifdef-y += fs.h
207 207 unifdef-y += gameport.h
208 208 unifdef-y += generic_serial.h
include/linux/futex.h
Diff comments   View file @ 58f64d8
... ... @@ -93,6 +93,7 @@
93 93 */
94 94 #define ROBUST_LIST_LIMIT 2048
95 95  
  96 +#ifdef __KERNEL__
96 97 long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout,
97 98 u32 __user *uaddr2, u32 val2, u32 val3);
98 99  
... ... @@ -110,6 +111,7 @@
110 111 {
111 112 }
112 113 #endif
  114 +#endif /* __KERNEL__ */
113 115  
114 116 #define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */
115 117 #define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */