The patch titled m68knommu: use the new byteorder headers has been removed from the -mm tree. Its filename was m68knommu-use-the-new-byteorder-headers.patch This patch was dropped because it was nacked The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: m68knommu: use the new byteorder headers From: Harvey Harrison <harvey.harrison@xxxxxxxxx> Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/m68knommu/include/asm/byteorder.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff -puN arch/m68knommu/include/asm/byteorder.h~m68knommu-use-the-new-byteorder-headers arch/m68knommu/include/asm/byteorder.h --- a/arch/m68knommu/include/asm/byteorder.h~m68knommu-use-the-new-byteorder-headers +++ a/arch/m68knommu/include/asm/byteorder.h @@ -3,13 +3,11 @@ #include <linux/types.h> -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) -# define __BYTEORDER_HAS_U64__ -# define __SWAB_64_THRU_32__ -#endif +#define __BIG_ENDIAN +#define __SWAB_64_THRU_32__ #if defined (__mcfisaaplus__) || defined (__mcfisac__) -static inline __attribute_const__ __u32 ___arch__swab32(__u32 val) +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) { asm( "byterev %0" @@ -18,10 +16,9 @@ static inline __attribute_const__ __u32 ); return val; } - -#define __arch__swab32(x) ___arch__swab32(x) +#define __arch_swab32 __arch_swab32 #endif -#include <linux/byteorder/big_endian.h> +#include <linux/byteorder.h> #endif /* _M68KNOMMU_BYTEORDER_H */ _ Patches currently in -mm which might be from harvey.harrison@xxxxxxxxx are origin.patch frv-use-the-new-byteorder-headers.patch h8300-use-the-new-byteorder-headers.patch alpha-use-the-new-byteorder-headers.patch lib-fix-sparse-shadowed-variable-warning.patch lib-radix_treec-make-percpu-variable-static.patch lib-proportionsc-trivial-sparse-lock-annotation.patch ibmpex-add-endian-annotation-to-extract_data-helper.patch blackfin-remove-__function__-in-video-driver.patch fb-carminefb-trivial-annotation-packing-color-register.patch linux-next.patch input-ads7846c-sparse-lock-annotation.patch scsi-replace-__inline-with-inline.patch scsi-use-the-common-hex_asc-array-rather-than-a-private-one.patch scsi-gdthc-use-unaligned-access-helpers.patch scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness.patch m68knommu-use-the-new-byteorder-headers.patch memstick-annotate-endianness-of-attribute-structs.patch byteorder-add-load_-store_endian-api.patch unaligned-consolidate-unaligned-headers-add-load_-store_endian_noalign.patch unaligned-wire-up-trivial-arches-for-new-common-unaligned-header.patch sh-wire-up-arch-overrides-for-unaligned-access-on-the-sh4a.patch unaligned-wire-up-h8300-and-m32r-arches.patch unaligned-wire-up-arm-arch-overrides-for-unaligned-access.patch unaligned-remove-the-old-implementation.patch ata-replace-byteshifting-with-unaligned-endian-helpers.patch usb-use-unaligned-endian-helpers-in-storage-drivers.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