Merge commit 'v2.6.28-rc2' into core/locking

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / uaccess_64.h

diff --git a/include/asm-x86/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
similarity index 97%
rename from include/asm-x86/uaccess_64.h
rename to arch/x86/include/asm/uaccess_64.h
index 13fd56fbc3aba9791d0fc5b9655f311eb4c8436c..543ba883cc66200ff0e2206aec36b434b63d3695 100644 (file)
--- a/include/asm-x86/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -1,5 +1,5 @@
-#ifndef __X86_64_UACCESS_H
-#define __X86_64_UACCESS_H
+#ifndef _ASM_X86_UACCESS_64_H
+#define _ASM_X86_UACCESS_64_H
 
 /*
  * User space memory access functions
@@ -7,6 +7,7 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/prefetch.h>
+#include <linux/lockdep.h>
 #include <asm/page.h>
 
 /*
@@ -204,4 +205,4 @@ static inline int __copy_from_user_inatomic_nocache(void *dst,
 unsigned long
 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
 
-#endif /* __X86_64_UACCESS_H */
+#endif /* _ASM_X86_UACCESS_64_H */