Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58f64d83 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

[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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1f29bcd7

include/linux/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ header-y += fd.h 
header-y += fdreg.h

header-y += fib_rules.h

header-y += fuse.h

header-y += futex.h

header-y += genetlink.h

header-y += gen_stats.h

header-y += gigaset_dev.h
@@ -203,6 +202,7 @@ unifdef-y += fb.h 
unifdef-y += fcntl.h

unifdef-y += filter.h

unifdef-y += flat.h

unifdef-y += futex.h

unifdef-y += fs.h

unifdef-y += gameport.h

unifdef-y += generic_serial.h

include/linux/futex.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ struct robust_list_head { 
 */

#define ROBUST_LIST_LIMIT	2048



#ifdef __KERNEL__

long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout,

	      u32 __user *uaddr2, u32 val2, u32 val3);
@@ -110,6 +111,7 @@ static inline void exit_pi_state_list(struct task_struct *curr) 
{

}

#endif

#endif /* __KERNEL__ */



#define FUTEX_OP_SET		0	/* *(int *)UADDR2 = OPARG; */

#define FUTEX_OP_ADD		1	/* *(int *)UADDR2 += OPARG; */