The patch titled unaligned: wire up trivial arches for new common unaligned header has been removed from the -mm tree. Its filename was unaligned-wire-up-trivial-arches-for-new-common-unaligned-header.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: unaligned: wire up trivial arches for new common unaligned header From: Harvey Harrison <harvey.harrison@xxxxxxxxx> 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 <harvey.harrison@xxxxxxxxx> Cc: <linux-arch@xxxxxxxxxxxxxxx> Cc: Richard Henderson <rth@xxxxxxxxxxx> Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Cc: Bryan Wu <bryan.wu@xxxxxxxxxx> Cc: Mikael Starvik <starvik@xxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Greg Ungerer <gerg@xxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Grant Grundler <grundler@xxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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(-) diff -puN arch/alpha/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/alpha/include/asm/unaligned.h --- a/arch/alpha/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/alpha/include/asm/unaligned.h @@ -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 */ diff -puN arch/avr32/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/avr32/include/asm/unaligned.h --- a/arch/avr32/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/avr32/include/asm/unaligned.h @@ -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 */ diff -puN arch/blackfin/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/blackfin/include/asm/unaligned.h --- a/arch/blackfin/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/blackfin/include/asm/unaligned.h @@ -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 */ diff -puN arch/cris/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/cris/include/asm/unaligned.h --- a/arch/cris/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/cris/include/asm/unaligned.h @@ -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 */ diff -puN arch/ia64/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/ia64/include/asm/unaligned.h --- a/arch/ia64/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/ia64/include/asm/unaligned.h @@ -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 */ diff -puN arch/m68knommu/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/m68knommu/include/asm/unaligned.h --- a/arch/m68knommu/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/m68knommu/include/asm/unaligned.h @@ -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 */ diff -puN arch/mips/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/mips/include/asm/unaligned.h --- a/arch/mips/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/mips/include/asm/unaligned.h @@ -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 */ diff -puN arch/parisc/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/parisc/include/asm/unaligned.h --- a/arch/parisc/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/parisc/include/asm/unaligned.h @@ -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; diff -puN arch/powerpc/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/powerpc/include/asm/unaligned.h --- a/arch/powerpc/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/powerpc/include/asm/unaligned.h @@ -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 */ diff -puN arch/s390/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/s390/include/asm/unaligned.h --- a/arch/s390/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/s390/include/asm/unaligned.h @@ -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 */ diff -puN arch/sparc/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/sparc/include/asm/unaligned.h --- a/arch/sparc/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/sparc/include/asm/unaligned.h @@ -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 */ diff -puN arch/x86/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/x86/include/asm/unaligned.h --- a/arch/x86/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/x86/include/asm/unaligned.h @@ -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 */ diff -puN arch/xtensa/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header arch/xtensa/include/asm/unaligned.h --- a/arch/xtensa/include/asm/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/arch/xtensa/include/asm/unaligned.h @@ -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 */ diff -puN include/asm-frv/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header include/asm-frv/unaligned.h --- a/include/asm-frv/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/include/asm-frv/unaligned.h @@ -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 */ diff -puN include/asm-m68k/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header include/asm-m68k/unaligned.h --- a/include/asm-m68k/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/include/asm-m68k/unaligned.h @@ -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 */ diff -puN include/asm-mn10300/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header include/asm-mn10300/unaligned.h --- a/include/asm-mn10300/unaligned.h~unaligned-wire-up-trivial-arches-for-new-common-unaligned-header +++ a/include/asm-mn10300/unaligned.h @@ -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 */ _ Patches currently in -mm which might be from harvey.harrison@xxxxxxxxx are origin.patch memstick-annotate-endianness-of-attribute-structs.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html