Commit 730f412c authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

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: default avatarJeff 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 07132922
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/uaccess.h>
static inline int static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr) futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#define _ASM_FUTEX_H #define _ASM_FUTEX_H
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h>
#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
do { \ do { \
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/barrier.h> #include <asm/barrier.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/uaccess.h>
#include <asm/war.h> #include <asm/war.h>
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \ #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/uaccess.h>
static inline int static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr) futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/synch.h> #include <asm/synch.h>
#include <asm/uaccess.h>
#include <asm/asm-compat.h> #include <asm/asm-compat.h>
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \ #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/uaccess.h>
/* XXX: UP variants, fix for SH-4A and SMP.. */ /* XXX: UP variants, fix for SH-4A and SMP.. */
#include <asm/futex-irq.h> #include <asm/futex-irq.h>
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#define _SPARC64_FUTEX_H #define _SPARC64_FUTEX_H
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h>
#define __futex_cas_op(insn, ret, oldval, uaddr, oparg) \ #define __futex_cas_op(insn, ret, oldval, uaddr, oparg) \
__asm__ __volatile__( \ __asm__ __volatile__( \
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h>
#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
asm volatile("1:\t" insn "\n" \ asm volatile("1:\t" insn "\n" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment