Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jeff Dike and committed by
Linus Torvalds
730f412c 07132922

+8 -8
+1 -1
include/asm-generic/futex.h
··· 4 4 #ifdef __KERNEL__ 5 5 6 6 #include <linux/futex.h> 7 + #include <linux/uaccess.h> 7 8 #include <asm/errno.h> 8 - #include <asm/uaccess.h> 9 9 10 10 static inline int 11 11 futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
+1 -1
include/asm-ia64/futex.h
··· 2 2 #define _ASM_FUTEX_H 3 3 4 4 #include <linux/futex.h> 5 + #include <linux/uaccess.h> 5 6 #include <asm/errno.h> 6 7 #include <asm/system.h> 7 - #include <asm/uaccess.h> 8 8 9 9 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ 10 10 do { \
+1 -1
include/asm-mips/futex.h
··· 11 11 #ifdef __KERNEL__ 12 12 13 13 #include <linux/futex.h> 14 + #include <linux/uaccess.h> 14 15 #include <asm/barrier.h> 15 16 #include <asm/errno.h> 16 - #include <asm/uaccess.h> 17 17 #include <asm/war.h> 18 18 19 19 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
+1 -1
include/asm-parisc/futex.h
··· 4 4 #ifdef __KERNEL__ 5 5 6 6 #include <linux/futex.h> 7 + #include <linux/uaccess.h> 7 8 #include <asm/errno.h> 8 - #include <asm/uaccess.h> 9 9 10 10 static inline int 11 11 futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
+1 -1
include/asm-powerpc/futex.h
··· 4 4 #ifdef __KERNEL__ 5 5 6 6 #include <linux/futex.h> 7 + #include <linux/uaccess.h> 7 8 #include <asm/errno.h> 8 9 #include <asm/synch.h> 9 - #include <asm/uaccess.h> 10 10 #include <asm/asm-compat.h> 11 11 12 12 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
+1 -1
include/asm-sh/futex.h
··· 4 4 #ifdef __KERNEL__ 5 5 6 6 #include <linux/futex.h> 7 + #include <linux/uaccess.h> 7 8 #include <asm/errno.h> 8 - #include <asm/uaccess.h> 9 9 10 10 /* XXX: UP variants, fix for SH-4A and SMP.. */ 11 11 #include <asm/futex-irq.h>
+1 -1
include/asm-sparc64/futex.h
··· 2 2 #define _SPARC64_FUTEX_H 3 3 4 4 #include <linux/futex.h> 5 + #include <linux/uaccess.h> 5 6 #include <asm/errno.h> 6 7 #include <asm/system.h> 7 - #include <asm/uaccess.h> 8 8 9 9 #define __futex_cas_op(insn, ret, oldval, uaddr, oparg) \ 10 10 __asm__ __volatile__( \
+1 -1
include/asm-x86/futex.h
··· 4 4 #ifdef __KERNEL__ 5 5 6 6 #include <linux/futex.h> 7 + #include <linux/uaccess.h> 7 8 8 9 #include <asm/asm.h> 9 10 #include <asm/errno.h> 10 11 #include <asm/processor.h> 11 12 #include <asm/system.h> 12 - #include <asm/uaccess.h> 13 13 14 14 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ 15 15 asm volatile("1:\t" insn "\n" \