unaligned: wire up trivial arches for new common unaligned header

PATCH In review Harvey Harrison 1 participant 1 message Nov 30, 2008

Subsystems (9)

x86 PowerPC MIPS s390 +5 more subsystems

lore

Share & tools

lore

Harvey Harrison

author

2008-11-30 02:40 UTC #0 lore raw

PATCH 3/7 unaligned: wire up trivial arches for new common unaligned header

Arches where unaligned access is OK, or arches the use packed-struct for the native endianness and byteshifting for the opposite endianness.

Signed-off-by Harvey Harrison <[email protected]>

---
 arch/alpha/include/asm/unaligned.h     |    7 +------
 arch/avr32/include/asm/unaligned.h     |    8 +-------
 arch/blackfin/include/asm/unaligned.h  |    7 +------
 arch/cris/include/asm/unaligned.h      |    7 ++-----
 arch/ia64/include/asm/unaligned.h      |    7 +------
 arch/m68knommu/include/asm/unaligned.h |   22 +++++-----------------
 arch/mips/include/asm/unaligned.h      |   17 +----------------
 arch/parisc/include/asm/unaligned.h    |    6 +-----
 arch/powerpc/include/asm/unaligned.h   |    7 ++-----
 arch/s390/include/asm/unaligned.h      |    7 ++-----
 arch/sparc/include/asm/unaligned.h     |    6 +-----
 arch/x86/include/asm/unaligned.h       |    8 ++------
 arch/xtensa/include/asm/unaligned.h    |   16 +---------------
 include/asm-frv/unaligned.h            |    7 +------
 include/asm-m68k/unaligned.h           |    7 ++-----
 include/asm-mn10300/unaligned.h        |    7 ++-----
 16 files changed, 26 insertions(+), 120 deletions(-)

arch/alpha/include/asm/unaligned.h +1 -6

index 3787c60..3ae1a25 100644
@@ -1,11 +1,6 @@
 #ifndef _ASM_ALPHA_UNALIGNED_H
 #define _ASM_ALPHA_UNALIGNED_H
 
-#include <linux/unaligned/le_struct.h>
-#include <linux/unaligned/be_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
+#include <linux/unaligned.h>
 
 #endif /* _ASM_ALPHA_UNALIGNED_H */

arch/avr32/include/asm/unaligned.h +1 -7

index 0418772..e85cf9c 100644
@@ -10,12 +10,6 @@
  * However, swapped word loads must be word-aligned so we can't
  * optimize word loads in general.
  */
-
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#include <linux/unaligned.h>
 
 #endif /* _ASM_AVR32_UNALIGNED_H */

arch/blackfin/include/asm/unaligned.h +1 -6

index fd8a1d6..e509f59 100644
@@ -1,11 +1,6 @@
 #ifndef _ASM_BLACKFIN_UNALIGNED_H
 #define _ASM_BLACKFIN_UNALIGNED_H
 
-#include <linux/unaligned/le_struct.h>
-#include <linux/unaligned/be_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_le
-#define put_unaligned	__put_unaligned_le
+#include <linux/unaligned.h>
 
 #endif /* _ASM_BLACKFIN_UNALIGNED_H */

arch/cris/include/asm/unaligned.h +2 -5

index 7b3f3fe..13aa4c1 100644
@@ -4,10 +4,7 @@
 /*
  * CRIS can do unaligned accesses itself. 
  */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_le
-#define put_unaligned	__put_unaligned_le
+#define _UNALIGNED_ACCESS_OK
+#include <linux/unaligned.h>
 
 #endif /* _ASM_CRIS_UNALIGNED_H */

arch/ia64/include/asm/unaligned.h +1 -6

index 7bddc7f..bfe338f 100644
@@ -1,11 +1,6 @@
 #ifndef _ASM_IA64_UNALIGNED_H
 #define _ASM_IA64_UNALIGNED_H
 
-#include <linux/unaligned/le_struct.h>
-#include <linux/unaligned/be_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_le
-#define put_unaligned	__put_unaligned_le
+#include <linux/unaligned.h>
 
 #endif /* _ASM_IA64_UNALIGNED_H */

arch/m68knommu/include/asm/unaligned.h +5 ~~-17~~

index eb1ea4c..fe1719f 100644
@@ -1,25 +1,13 @@
 #ifndef _ASM_M68KNOMMU_UNALIGNED_H
 #define _ASM_M68KNOMMU_UNALIGNED_H
 
-
-#ifdef CONFIG_COLDFIRE
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
-
-#else
 /*
- * The m68k can do unaligned accesses itself. 
+ * The m68k can do unaligned accesses itself.  COLDFIRE can not.
  */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
-
+#ifndef CONFIG_COLDFIRE
+# define _UNALIGNED_ACCESS_OK
 #endif
 
+#include <linux/unaligned.h>
+
 #endif /* _ASM_M68KNOMMU_UNALIGNED_H */

arch/mips/include/asm/unaligned.h +1 ~~-16~~

index 7924049..e2cb2be 100644
@@ -8,21 +8,6 @@
 #ifndef _ASM_MIPS_UNALIGNED_H
 #define _ASM_MIPS_UNALIGNED_H
 
-#include <linux/compiler.h>
-#if defined(__MIPSEB__)
-# include <linux/unaligned/be_struct.h>
-# include <linux/unaligned/le_byteshift.h>
-# include <linux/unaligned/generic.h>
-# define get_unaligned	__get_unaligned_be
-# define put_unaligned	__put_unaligned_be
-#elif defined(__MIPSEL__)
-# include <linux/unaligned/le_struct.h>
-# include <linux/unaligned/be_byteshift.h>
-# include <linux/unaligned/generic.h>
-# define get_unaligned	__get_unaligned_le
-# define put_unaligned	__put_unaligned_le
-#else
-#  error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
-#endif
+#include <linux/unaligned.h>
 
 #endif /* _ASM_MIPS_UNALIGNED_H */

arch/parisc/include/asm/unaligned.h +1 -5

index dfc5d33..cedbd46 100644
@@ -1,11 +1,7 @@
 #ifndef _ASM_PARISC_UNALIGNED_H
 #define _ASM_PARISC_UNALIGNED_H
 
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/generic.h>
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#include <linux/unaligned.h>
 
 #ifdef __KERNEL__
 struct pt_regs;

arch/powerpc/include/asm/unaligned.h +2 -5

index 5f1b1e3..f077db7 100644
@@ -6,11 +6,8 @@
 /*
  * The PowerPC can do unaligned accesses itself in big endian mode.
  */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#define _UNALIGNED_ACCESS_OK
+#include <linux/unaligned.h>
 
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_UNALIGNED_H */

arch/s390/include/asm/unaligned.h +2 -5

index da9627a..b397098 100644
@@ -4,10 +4,7 @@
 /*
  * The S390 can do unaligned accesses itself. 
  */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#define _UNALIGNED_ACCESS_OK
+#include <linux/unaligned.h>
 
 #endif /* _ASM_S390_UNALIGNED_H */

arch/sparc/include/asm/unaligned.h +1 -5

index 11d2d5f..7a34899 100644
@@ -1,10 +1,6 @@
 #ifndef _ASM_SPARC_UNALIGNED_H
 #define _ASM_SPARC_UNALIGNED_H
 
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/generic.h>
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#include <linux/unaligned.h>
 
 #endif /* _ASM_SPARC_UNALIGNED_H */

arch/x86/include/asm/unaligned.h +2 -6

index a7bd416..8aeddd8 100644
@@ -4,11 +4,7 @@
 /*
  * The x86 can do unaligned accesses itself.
  */
-
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned __get_unaligned_le
-#define put_unaligned __put_unaligned_le
+#define _UNALIGNED_ACCESS_OK
+#include <linux/unaligned.h>
 
 #endif /* _ASM_X86_UNALIGNED_H */

arch/xtensa/include/asm/unaligned.h +1 ~~-15~~

index 8e7ed04..956a792 100644
@@ -10,20 +10,6 @@
 #ifndef _ASM_XTENSA_UNALIGNED_H
 #define _ASM_XTENSA_UNALIGNED_H
 
-#include <asm/byteorder.h>
-
-#ifdef __LITTLE_ENDIAN
-# include <linux/unaligned/le_struct.h>
-# include <linux/unaligned/be_byteshift.h>
-# include <linux/unaligned/generic.h>
-# define get_unaligned	__get_unaligned_le
-# define put_unaligned	__put_unaligned_le
-#else
-# include <linux/unaligned/be_struct.h>
-# include <linux/unaligned/le_byteshift.h>
-# include <linux/unaligned/generic.h>
-# define get_unaligned	__get_unaligned_be
-# define put_unaligned	__put_unaligned_be
-#endif
+#include <linux/unaligned.h>
 
 #endif	/* _ASM_XTENSA_UNALIGNED_H */

include/asm-frv/unaligned.h +1 -6

index 6c61c05..00e23aa 100644
@@ -12,11 +12,6 @@
 #ifndef _ASM_UNALIGNED_H
 #define _ASM_UNALIGNED_H
 
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#include <linux/unaligned.h>
 
 #endif /* _ASM_UNALIGNED_H */

include/asm-m68k/unaligned.h +2 -5

index 77698f2..59f03b9 100644
@@ -4,10 +4,7 @@
 /*
  * The m68k can do unaligned accesses itself.
  */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_be
-#define put_unaligned	__put_unaligned_be
+#define _UNALIGNED_ACCESS_OK
+#include <linux/unaligned.h>
 
 #endif /* _ASM_M68K_UNALIGNED_H */

include/asm-mn10300/unaligned.h +2 -5

index 0df6713..5471a65 100644
@@ -11,10 +11,7 @@
 #ifndef _ASM_MN10300_UNALIGNED_H
 #define _ASM_MN10300_UNALIGNED_H
 
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned	__get_unaligned_le
-#define put_unaligned	__put_unaligned_le
+#define _UNALIGNED_ACCESS_OK
+#include <linux/unaligned.h>
 
 #endif /* _ASM_MN10300_UNALIGNED_H */

Signature · 1 line

1.6.0.4.1044.g77718