The patch titled asm-*/futex.h should include linux/uaccess.h has been removed from the -mm tree. Its filename was asm-futexh-should-include-linux-uaccessh.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: asm-*/futex.h should include linux/uaccess.h From: Jeff Dike <jdike@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mundt <lethal@xxxxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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(-) diff -puN include/asm-generic/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-generic/futex.h --- a/include/asm-generic/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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) diff -puN include/asm-ia64/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-ia64/futex.h --- a/include/asm-ia64/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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 { \ diff -puN include/asm-mips/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-mips/futex.h --- a/include/asm-mips/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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) \ diff -puN include/asm-parisc/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-parisc/futex.h --- a/include/asm-parisc/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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) diff -puN include/asm-powerpc/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-powerpc/futex.h --- a/include/asm-powerpc/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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) \ diff -puN include/asm-sh/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-sh/futex.h --- a/include/asm-sh/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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> diff -puN include/asm-sparc64/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-sparc64/futex.h --- a/include/asm-sparc64/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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__( \ diff -puN include/asm-x86/futex.h~asm-futexh-should-include-linux-uaccessh include/asm-x86/futex.h --- a/include/asm-x86/futex.h~asm-futexh-should-include-linux-uaccessh +++ a/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("1:\t" insn "\n" \ _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are origin.patch rename-div64_64-to-div64_u64.patch git-kvm.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html