asm/futex.h should include linux/uaccess.h

PATCH In review Jeff Dike 1 participant 1 message Apr 25, 2008

Subsystems (3)

Generic include/asm header files User-mode Linux (UML) Futex

lore

Share & tools

lore

Jeff Dike

author

2008-04-25 17:56 UTC #0 lore raw

PATCH 8/19 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.

Compile-tested on sparc64, x86, ia64, mips, and powerpc.

Signed-off-by Jeff Dike <jdike-VuQAYsv1563Yd54FQh9/[email protected]>

---
 include/asm-generic/futex.h |    2 +-
 include/asm-ia64/futex.h    |    2 +-
 include/asm-mips/futex.h    |    2 +-
 include/asm-parisc/futex.h  |    2 +-
 include/asm-powerpc/futex.h |    2 +-
 include/asm-sh/futex.h      |    2 +-
 include/asm-sparc64/futex.h |    2 +-
 include/asm-x86/futex.h     |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

include/asm-generic/futex.h +1 -1

Index: linux-2.6.22/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)

include/asm-ia64/futex.h +1 -1

Index: linux-2.6.22/include/asm-ia64/futex.h
===================================================================
@@ -2,9 +2,9 @@
 #define _ASM_FUTEX_H
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
 do {									\

include/asm-mips/futex.h +1 -1

Index: linux-2.6.22/include/asm-mips/futex.h
===================================================================
@@ -11,9 +11,9 @@
 #ifdef __KERNEL__
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/barrier.h>
 #include <asm/errno.h>
-#include <asm/uaccess.h>
 #include <asm/war.h>
 
 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg)		\

include/asm-parisc/futex.h +1 -1

Index: linux-2.6.22/include/asm-parisc/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)

include/asm-powerpc/futex.h +1 -1

Index: linux-2.6.22/include/asm-powerpc/futex.h
===================================================================
@@ -4,9 +4,9 @@
 #ifdef __KERNEL__
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/synch.h>
-#include <asm/uaccess.h>
 #include <asm/asm-compat.h>
 
 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \

include/asm-sh/futex.h +1 -1

Index: linux-2.6.22/include/asm-sh/futex.h
===================================================================
@@ -4,8 +4,8 @@
 #ifdef __KERNEL__
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/errno.h>
-#include <asm/uaccess.h>
 
 /* XXX: UP variants, fix for SH-4A and SMP.. */
 #include <asm/futex-irq.h>

include/asm-sparc64/futex.h +1 -1

Index: linux-2.6.22/include/asm-sparc64/futex.h
===================================================================
@@ -2,9 +2,9 @@
 #define _SPARC64_FUTEX_H
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #define __futex_cas_op(insn, ret, oldval, uaddr, oparg)	\
 	__asm__ __volatile__(				\

include/asm-x86/futex.h +1 -1

Index: linux-2.6.22/include/asm-x86/futex.h
===================================================================
@@ -4,12 +4,12 @@
 #ifdef __KERNEL__
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 
 #include <asm/asm.h>
 #include <asm/errno.h>
 #include <asm/processor.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)	\
   __asm__ __volatile(						\