Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 730f412c08c13858f7681bac0a2770fbc9159fed

Authored by Jeff Dike
Committed by Linus Torvalds
1 parent 07132922aa
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 8 changed files with 8 additions and 8 deletions Side-by-side Diff

include/asm-generic/futex.h
Diff comments   View file @ 730f412
... ... @@ -4,8 +4,8 @@
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)
include/asm-ia64/futex.h
Diff comments   View file @ 730f412
... ... @@ -2,9 +2,9 @@
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 { \
include/asm-mips/futex.h
Diff comments   View file @ 730f412
... ... @@ -11,9 +11,9 @@
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) \
include/asm-parisc/futex.h
Diff comments   View file @ 730f412
... ... @@ -4,8 +4,8 @@
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)
include/asm-powerpc/futex.h
Diff comments   View file @ 730f412
... ... @@ -4,9 +4,9 @@
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) \
include/asm-sh/futex.h
Diff comments   View file @ 730f412
... ... @@ -4,8 +4,8 @@
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>
include/asm-sparc64/futex.h
Diff comments   View file @ 730f412
... ... @@ -2,9 +2,9 @@
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__( \
include/asm-x86/futex.h
Diff comments   View file @ 730f412
... ... @@ -4,12 +4,12 @@
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" \