Re: [PATCH 11/23] m68knommu: use the new byteorder headers

[Greg Ungerer]

Hi Harvey,

Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>

Looks ok to me.

Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>

Regards
Greg


>  arch/m68knommu/include/asm/byteorder.h |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/arch/m68knommu/include/asm/byteorder.h b/arch/m68knommu/include/asm/byteorder.h
> index 20bb442..6d9d3b8 100644
> --- a/arch/m68knommu/include/asm/byteorder.h
> +++ b/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 ___arch__swab32(__u32 val)
>  	   );
>  	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 */


--
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg@xxxxxxxxxxxx
SnapGear -- a Secure Computing Company      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/