Move the definition of the unaligned helpers into generic.h and test
the endianness from asm/byteorder.h, remove it from each asm/unaligned.h

Signed-off-by: Harvey Harrison
---
Andrew, this applies on top of the series reworking the byteorder helpers now
that we can rely on them setting the machine endianness.

include/asm-alpha/unaligned.h | 3 ---
include/asm-arm/unaligned.h | 11 -----------
include/asm-avr32/unaligned.h | 3 ---
include/asm-blackfin/unaligned.h | 3 ---
include/asm-cris/unaligned.h | 3 ---
include/asm-frv/unaligned.h | 3 ---
include/asm-h8300/unaligned.h | 3 ---
include/asm-ia64/unaligned.h | 3 ---
include/asm-m32r/unaligned.h | 12 +++++-------
include/asm-m68k/unaligned.h | 3 ---
include/asm-m68knommu/unaligned.h | 11 ++---------
include/asm-mips/unaligned.h | 16 ++++++----------
include/asm-mn10300/unaligned.h | 3 ---
include/asm-parisc/unaligned.h | 2 --
include/asm-powerpc/unaligned.h | 3 ---
include/asm-s390/unaligned.h | 3 ---
include/asm-sh/unaligned.h | 12 +++++-------
include/asm-sparc/unaligned.h | 2 --
include/asm-sparc64/unaligned.h | 2 --
include/asm-v850/unaligned.h | 3 ---
include/asm-x86/unaligned.h | 4 ----
include/asm-xtensa/unaligned.h | 16 ++++++----------
include/linux/unaligned/generic.h | 10 ++++++++++
23 files changed, 34 insertions(+), 100 deletions(-)

diff --git a/include/asm-alpha/unaligned.h b/include/asm-alpha/unaligned.h
index 3787c60..84b08e0 100644
--- a/include/asm-alpha/unaligned.h
+++ b/include/asm-alpha/unaligned.h
@@ -5,7 +5,4 @@
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_ALPHA_UNALIGNED_H */
diff --git a/include/asm-arm/unaligned.h b/include/asm-arm/unaligned.h
index 44593a8..70088d3 100644
--- a/include/asm-arm/unaligned.h
+++ b/include/asm-arm/unaligned.h
@@ -5,15 +5,4 @@
#include
#include

-/*
- * Select endianness
- */
-#ifndef __ARMEB__
-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-#else
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-#endif
-
#endif /* _ASM_ARM_UNALIGNED_H */
diff --git a/include/asm-avr32/unaligned.h b/include/asm-avr32/unaligned.h
index 0418772..a350f4a 100644
--- a/include/asm-avr32/unaligned.h
+++ b/include/asm-avr32/unaligned.h
@@ -15,7 +15,4 @@
#include
#include

-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif /* _ASM_AVR32_UNALIGNED_H */
diff --git a/include/asm-blackfin/unaligned.h b/include/asm-blackfin/unaligned.h
index fd8a1d6..0653195 100644
--- a/include/asm-blackfin/unaligned.h
+++ b/include/asm-blackfin/unaligned.h
@@ -5,7 +5,4 @@
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_BLACKFIN_UNALIGNED_H */
diff --git a/include/asm-cris/unaligned.h b/include/asm-cris/unaligned.h
index 7b3f3fe..a518cef 100644
--- a/include/asm-cris/unaligned.h
+++ b/include/asm-cris/unaligned.h
@@ -7,7 +7,4 @@
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_CRIS_UNALIGNED_H */
diff --git a/include/asm-frv/unaligned.h b/include/asm-frv/unaligned.h
index 839a2fb..3774d1e 100644
--- a/include/asm-frv/unaligned.h
+++ b/include/asm-frv/unaligned.h
@@ -16,7 +16,4 @@
#include
#include

-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif /* _ASM_UNALIGNED_H */
diff --git a/include/asm-h8300/unaligned.h b/include/asm-h8300/unaligned.h
index b8d06c7..2f0c281 100644
--- a/include/asm-h8300/unaligned.h
+++ b/include/asm-h8300/unaligned.h
@@ -5,7 +5,4 @@
#include
#include

-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif /* _ASM_H8300_UNALIGNED_H */
diff --git a/include/asm-ia64/unaligned.h b/include/asm-ia64/unaligned.h
index 7bddc7f..3ad9366 100644
--- a/include/asm-ia64/unaligned.h
+++ b/include/asm-ia64/unaligned.h
@@ -5,7 +5,4 @@
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_IA64_UNALIGNED_H */
diff --git a/include/asm-m32r/unaligned.h b/include/asm-m32r/unaligned.h
index 377eb20..04d4138 100644
--- a/include/asm-m32r/unaligned.h
+++ b/include/asm-m32r/unaligned.h
@@ -1,18 +1,16 @@
#ifndef _ASM_M32R_UNALIGNED_H
#define _ASM_M32R_UNALIGNED_H

-#if defined(__LITTLE_ENDIAN__)
+#include
+
+#ifdef __LITTLE_ENDIAN
# include
# include
-# include
-# define get_unaligned __get_unaligned_le
-# define put_unaligned __put_unaligned_le
#else
# include
# include
-# include
-# define get_unaligned __get_unaligned_be
-# define put_unaligned __put_unaligned_be
#endif

+#include
+
#endif /* _ASM_M32R_UNALIGNED_H */
diff --git a/include/asm-m68k/unaligned.h b/include/asm-m68k/unaligned.h
index 77698f2..1b909e8 100644
--- a/include/asm-m68k/unaligned.h
+++ b/include/asm-m68k/unaligned.h
@@ -7,7 +7,4 @@
#include
#include

-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif /* _ASM_M68K_UNALIGNED_H */
diff --git a/include/asm-m68knommu/unaligned.h b/include/asm-m68knommu/unaligned.h
index eb1ea4c..965b640 100644
--- a/include/asm-m68knommu/unaligned.h
+++ b/include/asm-m68knommu/unaligned.h
@@ -5,21 +5,14 @@
#ifdef CONFIG_COLDFIRE
#include
#include
-#include
-
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be

#else
/*
* The m68k can do unaligned accesses itself.
*/
#include
-#include
-
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif

+#include
+
#endif /* _ASM_M68KNOMMU_UNALIGNED_H */
diff --git a/include/asm-mips/unaligned.h b/include/asm-mips/unaligned.h
index 7924049..28412fc 100644
--- a/include/asm-mips/unaligned.h
+++ b/include/asm-mips/unaligned.h
@@ -9,20 +9,16 @@
#define _ASM_MIPS_UNALIGNED_H

#include
-#if defined(__MIPSEB__)
+#include
+
+#ifdef __BIG_ENDIAN
# include
# include
-# include
-# define get_unaligned __get_unaligned_be
-# define put_unaligned __put_unaligned_be
-#elif defined(__MIPSEL__)
+#else
# include
# include
-# include
-# define get_unaligned __get_unaligned_le
-# define put_unaligned __put_unaligned_le
-#else
-# error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
#endif

+#include
+
#endif /* _ASM_MIPS_UNALIGNED_H */
diff --git a/include/asm-mn10300/unaligned.h b/include/asm-mn10300/unaligned.h
index 0df6713..d0cf9b4 100644
--- a/include/asm-mn10300/unaligned.h
+++ b/include/asm-mn10300/unaligned.h
@@ -14,7 +14,4 @@
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_MN10300_UNALIGNED_H */
diff --git a/include/asm-parisc/unaligned.h b/include/asm-parisc/unaligned.h
index dfc5d33..3239de9 100644
--- a/include/asm-parisc/unaligned.h
+++ b/include/asm-parisc/unaligned.h
@@ -4,8 +4,6 @@
#include
#include
#include
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be

#ifdef __KERNEL__
struct pt_regs;
diff --git a/include/asm-powerpc/unaligned.h b/include/asm-powerpc/unaligned.h
index 5f1b1e3..4ba95d5 100644
--- a/include/asm-powerpc/unaligned.h
+++ b/include/asm-powerpc/unaligned.h
@@ -9,8 +9,5 @@
#include
#include

-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_UNALIGNED_H */
diff --git a/include/asm-s390/unaligned.h b/include/asm-s390/unaligned.h
index da9627a..75d37cb 100644
--- a/include/asm-s390/unaligned.h
+++ b/include/asm-s390/unaligned.h
@@ -7,7 +7,4 @@
#include
#include

-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be
-
#endif /* _ASM_S390_UNALIGNED_H */
diff --git a/include/asm-sh/unaligned.h b/include/asm-sh/unaligned.h
index c1641a0..6a15824 100644
--- a/include/asm-sh/unaligned.h
+++ b/include/asm-sh/unaligned.h
@@ -1,19 +1,17 @@
#ifndef _ASM_SH_UNALIGNED_H
#define _ASM_SH_UNALIGNED_H

+#include
+
/* SH can't handle unaligned accesses. */
-#ifdef __LITTLE_ENDIAN__
+#ifdef __LITTLE_ENDIAN
# include
# include
-# include
-# define get_unaligned __get_unaligned_le
-# define put_unaligned __put_unaligned_le
#else
# include
# include
-# include
-# define get_unaligned __get_unaligned_be
-# define put_unaligned __put_unaligned_be
#endif

+#include
+
#endif /* _ASM_SH_UNALIGNED_H */
diff --git a/include/asm-sparc/unaligned.h b/include/asm-sparc/unaligned.h
index 11d2d5f..77c7cac 100644
--- a/include/asm-sparc/unaligned.h
+++ b/include/asm-sparc/unaligned.h
@@ -4,7 +4,5 @@
#include
#include
#include
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be

#endif /* _ASM_SPARC_UNALIGNED_H */
diff --git a/include/asm-sparc64/unaligned.h b/include/asm-sparc64/unaligned.h
index edcebb0..8196716 100644
--- a/include/asm-sparc64/unaligned.h
+++ b/include/asm-sparc64/unaligned.h
@@ -4,7 +4,5 @@
#include
#include
#include
-#define get_unaligned __get_unaligned_be
-#define put_unaligned __put_unaligned_be

#endif /* _ASM_SPARC64_UNALIGNED_H */
diff --git a/include/asm-v850/unaligned.h b/include/asm-v850/unaligned.h
index 53122b2..6e6f4d2 100644
--- a/include/asm-v850/unaligned.h
+++ b/include/asm-v850/unaligned.h
@@ -16,7 +16,4 @@
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_V850_UNALIGNED_H */
diff --git a/include/asm-x86/unaligned.h b/include/asm-x86/unaligned.h
index a7bd416..4c3fe16 100644
--- a/include/asm-x86/unaligned.h
+++ b/include/asm-x86/unaligned.h
@@ -4,11 +4,7 @@
/*
* The x86 can do unaligned accesses itself.
*/
-
#include
#include

-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
-
#endif /* _ASM_X86_UNALIGNED_H */
diff --git a/include/asm-xtensa/unaligned.h b/include/asm-xtensa/unaligned.h
index 8f3424f..13ae4bb 100644
--- a/include/asm-xtensa/unaligned.h
+++ b/include/asm-xtensa/unaligned.h
@@ -10,20 +10,16 @@
#ifndef _ASM_XTENSA_UNALIGNED_H
#define _ASM_XTENSA_UNALIGNED_H

-#ifdef __XTENSA_EL__
+#include
+
+#ifdef __LITTLE_ENDIAN
# include
# include
-# include
-# define get_unaligned __get_unaligned_le
-# define put_unaligned __put_unaligned_le
-#elif defined(__XTENSA_EB__)
+#else
# include
# include
-# include
-# define get_unaligned __get_unaligned_be
-# define put_unaligned __put_unaligned_be
-#else
-# error processor byte order undefined!
#endif

+#include
+
#endif /* _ASM_XTENSA_UNALIGNED_H */
diff --git a/include/linux/unaligned/generic.h b/include/linux/unaligned/generic.h
index 02d97ff..bd4c6c9 100644
--- a/include/linux/unaligned/generic.h
+++ b/include/linux/unaligned/generic.h
@@ -1,6 +1,8 @@
#ifndef _LINUX_UNALIGNED_GENERIC_H
#define _LINUX_UNALIGNED_GENERIC_H

+#include
+
/*
* Cause a link-time error if we try an unaligned access other than
* 1,2,4 or 8 bytes long
@@ -65,4 +67,12 @@ extern void __bad_unaligned_access_size(void);
} \
(void)0; })

+#ifdef __LITTLE_ENDIAN
+# define get_unaligned __get_unaligned_le
+# define put_unaligned __put_unaligned_le
+#else
+# define get_unaligned __get_unaligned_be
+# define put_unaligned __put_unaligned_be
+#endif
+
#endif /* _LINUX_UNALIGNED_GENERIC_H */
--
1.5.6.1.281.g1087e



--
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/