The patch titled byteorder: sparc: use the new byteorder headers has been removed from the -mm tree. Its filename was byteorder-sparc-use-the-new-byteorder-headers.patch This patch was dropped because it had testing failures The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: byteorder: sparc: use the new byteorder headers From: Harvey Harrison <harvey.harrison@xxxxxxxxx> Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> Acked-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc/include/asm/byteorder.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff -puN arch/sparc/include/asm/byteorder.h~byteorder-sparc-use-the-new-byteorder-headers arch/sparc/include/asm/byteorder.h --- a/arch/sparc/include/asm/byteorder.h~byteorder-sparc-use-the-new-byteorder-headers +++ a/arch/sparc/include/asm/byteorder.h @@ -4,15 +4,14 @@ #include <asm/types.h> #include <asm/asi.h> -#ifdef __GNUC__ +#define __BIG_ENDIAN #ifdef CONFIG_SPARC32 #define __SWAB_64_THRU_32__ #endif #ifdef CONFIG_SPARC64 - -static inline __u16 ___arch__swab16p(const __u16 *addr) +static inline __u16 __arch_swab16p(const __u16 *addr) { __u16 ret; @@ -21,8 +20,9 @@ static inline __u16 ___arch__swab16p(con : "r" (addr), "i" (ASI_PL)); return ret; } +#define __arch_swab16p __arch_swab16p -static inline __u32 ___arch__swab32p(const __u32 *addr) +static inline __u32 __arch_swab32p(const __u32 *addr) { __u32 ret; @@ -31,8 +31,9 @@ static inline __u32 ___arch__swab32p(con : "r" (addr), "i" (ASI_PL)); return ret; } +#define __arch_swab32p __arch_swab32p -static inline __u64 ___arch__swab64p(const __u64 *addr) +static inline __u64 __arch_swab64p(const __u64 *addr) { __u64 ret; @@ -41,17 +42,10 @@ static inline __u64 ___arch__swab64p(con : "r" (addr), "i" (ASI_PL)); return ret; } - -#define __arch__swab16p(x) ___arch__swab16p(x) -#define __arch__swab32p(x) ___arch__swab32p(x) -#define __arch__swab64p(x) ___arch__swab64p(x) +#define __arch_swab64p __arch_swab64p #endif /* CONFIG_SPARC64 */ -#define __BYTEORDER_HAS_U64__ - -#endif - -#include <linux/byteorder/big_endian.h> +#include <linux/byteorder.h> #endif /* _SPARC_BYTEORDER_H */ _ Patches currently in -mm which might be from harvey.harrison@xxxxxxxxx are byteorder-add-a-new-include-linux-swabh-to-define-byteswapping-functions.patch byteorder-add-include-linux-byteorderh-to-define-endian-helpers.patch linux-next.patch x86-fix-shadowed-variable-warning.patch cifs-remove-global_extern-macro.patch ppc-use-the-common-ascii-hex-helpers.patch powerpc-replace-__function__-with-__func__.patch v4l-drx397xdc-sparse-annotations.patch input-ads7846c-sparse-lock-annotation.patch kvm-make-functions-static.patch misdn-endian-annotations-for-struct-zt.patch misdn-annotate-iomem-pointer-and-add-statics.patch drivers-net-replace-__function__-with-__func__.patch scsi-replace-__inline-with-inline.patch scsi-aic79xx_core-fix-shadowed-variables-add-statics.patch scsi-aic79xx-aic79xx_pcic-fix-shadowed-variables.patch scsi-gdthc-use-unaligned-access-helpers.patch scsi-use-the-common-hex_asc-array-rather-than-a-private-one.patch wireless-replace-__function__-with-__func__.patch xfs-use-get_unaligned_-helpers.patch xtensa-replace-remaining-__function__-occurences.patch olpc-olpc_batteryc-sparse-endian-annotations.patch include-replace-__function__-with-__func__.patch misc-replace-__function__-with-__func__.patch befs-annotate-fs32-on-tests-for-superblock-endianness.patch net-tipc-subscrc-dont-use-___constant_swab32.patch byteorder-sparc-use-the-new-byteorder-headers.patch byteorder-x86-use-the-new-byteorder-headers.patch byteorder-xtensa-use-the-new-byteorder-headers.patch byteorder-fix-direct-byteswap-includes.patch byteorder-remove-the-old-byteorder-implementation.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