Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/asm-generic/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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) \