Re: [PATCH 10/10] xtensa: use the new byteorder headers

[Chris Zankel <chris@zankel.net>]

Hi Harvey,

I have added your patch to the xtensa-next tree on kernel.org and will 
push to Linus soon.

Thanks,
-Chris

Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
>  include/asm-xtensa/byteorder.h |   32 +++++++++++++++-----------------
>  1 files changed, 15 insertions(+), 17 deletions(-)
> 
> diff --git a/include/asm-xtensa/byteorder.h b/include/asm-xtensa/byteorder.h
> index 765edf1..07d10ad 100644
> --- a/include/asm-xtensa/byteorder.h
> +++ b/include/asm-xtensa/byteorder.h
> @@ -14,7 +14,17 @@
>  #include <asm/types.h>
>  #include <linux/compiler.h>
>  
> -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
> +#ifdef __XTENSA_EL__
> +# define __LITTLE_ENDIAN
> +#elif defined(__XTENSA_EB__)
> +# define __BIG_ENDIAN
> +#else
> +# error processor byte order undefined!
> +#endif
> +
> +#define __SWAB_64_THRU_32__
> +
> +static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
>  {
>      __u32 res;
>      /* instruction sequence from Xtensa ISA release 2/2000 */
> @@ -28,8 +38,9 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
>  	    );
>      return res;
>  }
> +#define __arch_swab32 __arch_swab32
>  
> -static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
> +static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
>  {
>      /* Given that 'short' values are signed (i.e., can be negative),
>       * we cannot assume that the upper 16-bits of the register are
> @@ -62,21 +73,8 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
>  
>      return res;
>  }
> +#define __arch_swab16 __arch_swab16
>  
> -#define __arch__swab32(x) ___arch__swab32(x)
> -#define __arch__swab16(x) ___arch__swab16(x)
> -
> -#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
> -#  define __BYTEORDER_HAS_U64__
> -#  define __SWAB_64_THRU_32__
> -#endif
> -
> -#ifdef __XTENSA_EL__
> -# include <linux/byteorder/little_endian.h>
> -#elif defined(__XTENSA_EB__)
> -# include <linux/byteorder/big_endian.h>
> -#else
> -# error processor byte order undefined!
> -#endif
> +#include <linux/byteorder.h>
>  
>  #endif /* _XTENSA_BYTEORDER_H */