aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic/futex.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-04-30 00:54:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 08:29:52 -0700
commit730f412c08c13858f7681bac0a2770fbc9159fed (patch)
treeac37a43aef9dca3a6e63c9bdf97c489af3801357 /include/asm-generic/futex.h
parent07132922aac0caf807c56b9c2a388954b357a8c4 (diff)
downloadkernel_samsung_aries-730f412c08c13858f7681bac0a2770fbc9159fed.zip
kernel_samsung_aries-730f412c08c13858f7681bac0a2770fbc9159fed.tar.gz
kernel_samsung_aries-730f412c08c13858f7681bac0a2770fbc9159fed.tar.bz2
asm-*/futex.h should include linux/uaccess.h
Lots of asm-*/futex.h call pagefault_enable and pagefault_disable, which are declared in linux/uaccess.h, without including linux/uaccess.h. They all include asm/uaccess.h, so this patch replaces asm/uaccess.h with linux/uaccess.h. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mundt <lethal@linux-sh.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic/futex.h')
-rw-r--r--include/asm-generic/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index f422df0..67b60b9 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -4,8 +4,8 @@
#ifdef __KERNEL__
#include <linux/futex.h>
+#include <linux/uaccess.h>
#include <asm/errno.h>
-#include <asm/uaccess.h>
static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)