The asm-generic/uaccess.h file is only implementing unaligned accesses. Rename it to uaccess-unaligned.h so we can replace it with a generic uaccess.h for all NOMMU architectures. Signed-off-by: Remis Lima Baima Signed-off-by: Arnd Bergmann --- arch/parisc/include/asm/uaccess.h | 2 +- arch/sparc/include/asm/uaccess_64.h | 2 +- .../asm-generic/{uaccess.h => uaccess-unaligned.h} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename include/asm-generic/{uaccess.h => uaccess-unaligned.h} (82%) diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index cd4c0b2..7cf799d 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #define VERIFY_READ 0 #define VERIFY_WRITE 1 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index c64e767..a38c032 100644 --- a/arch/sparc/include/asm/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #endif #ifndef __ASSEMBLY__ diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess-unaligned.h similarity index 82% rename from include/asm-generic/uaccess.h rename to include/asm-generic/uaccess-unaligned.h index 549cb3a..67deb89 100644 --- a/include/asm-generic/uaccess.h +++ b/include/asm-generic/uaccess-unaligned.h @@ -1,5 +1,5 @@ -#ifndef _ASM_GENERIC_UACCESS_H_ -#define _ASM_GENERIC_UACCESS_H_ +#ifndef __ASM_GENERIC_UACCESS_UNALIGNED_H +#define __ASM_GENERIC_UACCESS_UNALIGNED_H /* * This macro should be used instead of __get_user() when accessing @@ -23,4 +23,4 @@ __copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \ }) -#endif /* _ASM_GENERIC_UACCESS_H */ +#endif /* __ASM_GENERIC_UACCESS_UNALIGNED_H */ -- 1.5.6.3 -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/