From c942921cde9806a49fdcd26c2566f183867956d7 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 10 Dec 2006 02:19:11 -0800 Subject: [PATCH] --- yaml --- r: 43960 b: refs/heads/master c: 58f64d83c37f5073a01573d27043c9c0ccc764f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/Kbuild | 2 +- trunk/include/linux/futex.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 89227d28141f..0a269389c7f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f29bcd739972f71f2fd5d5d265daf3e1208fa5e +refs/heads/master: 58f64d83c37f5073a01573d27043c9c0ccc764f1 diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild index e618b25b5add..a1b04d8a1d01 100644 --- a/trunk/include/linux/Kbuild +++ b/trunk/include/linux/Kbuild @@ -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 diff --git a/trunk/include/linux/futex.h b/trunk/include/linux/futex.h index d097b5b72bc6..3f153b4e156c 100644 --- a/trunk/include/linux/futex.h +++ b/trunk/include/linux/futex.h @@ -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; */