From 3d8ee21c4a051e6ca02aac04ffcf92d549db788b Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Wed, 30 Apr 2008 00:54:49 -0700
Subject: [PATCH] --- yaml --- r: 95281 b: refs/heads/master c:
 730f412c08c13858f7681bac0a2770fbc9159fed h: refs/heads/master i:   95279:
 defc5078b6e59ac742e12bfcba5dfff8b64954b6 v: v3

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

diff --git a/[refs] b/[refs]
index 63a13dd6470b..06122741cd40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07132922aac0caf807c56b9c2a388954b357a8c4
+refs/heads/master: 730f412c08c13858f7681bac0a2770fbc9159fed
diff --git a/trunk/include/asm-generic/futex.h b/trunk/include/asm-generic/futex.h
index f422df0956a2..67b60b917d88 100644
--- a/trunk/include/asm-generic/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-ia64/futex.h b/trunk/include/asm-ia64/futex.h
index 8a98a2654139..c7f0f062239c 100644
--- a/trunk/include/asm-ia64/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-mips/futex.h b/trunk/include/asm-mips/futex.h
index 17f082cfea85..b9cce90346cf 100644
--- a/trunk/include/asm-mips/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-parisc/futex.h b/trunk/include/asm-parisc/futex.h
index fdc6d055ef7f..0c705c3a55ef 100644
--- a/trunk/include/asm-parisc/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-powerpc/futex.h b/trunk/include/asm-powerpc/futex.h
index 3f3673fd3ff3..6d406c5c5de4 100644
--- a/trunk/include/asm-powerpc/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-sh/futex.h b/trunk/include/asm-sh/futex.h
index 74ed3681d33c..68256ec5fa35 100644
--- a/trunk/include/asm-sh/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-sparc64/futex.h b/trunk/include/asm-sparc64/futex.h
index df1097d6ffbe..d8378935ae90 100644
--- a/trunk/include/asm-sparc64/futex.h
+++ b/trunk/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 --git a/trunk/include/asm-x86/futex.h b/trunk/include/asm-x86/futex.h
index ac0fbf24d722..e7a76b37b333 100644
--- a/trunk/include/asm-x86/futex.h
+++ b/trunk/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"				\