lkml.org 
[lkml]   [2008]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 16/20] s390: use the new byteorder headers
    From
    Date
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    ---
    include/asm-s390/byteorder.h | 70 ++++++++++++------------------------------
    1 files changed, 20 insertions(+), 50 deletions(-)

    diff --git a/include/asm-s390/byteorder.h b/include/asm-s390/byteorder.h
    index 1fe2492..b84c490 100644
    --- a/include/asm-s390/byteorder.h
    +++ b/include/asm-s390/byteorder.h
    @@ -11,32 +11,39 @@

    #include <asm/types.h>

    -#ifdef __GNUC__
    +#define __BIG_ENDIAN
    +
    +#ifndef __s390x__
    +# define __SWAB_64_THRU_32__
    +#endif

    #ifdef __s390x__
    -static inline __u64 ___arch__swab64p(const __u64 *x)
    +static inline __u64 __arch_swab64p(const __u64 *x)
    {
    __u64 result;

    asm volatile("lrvg %0,%1" : "=d" (result) : "m" (*x));
    return result;
    }
    +#define HAVE_ARCH_SWAB64P

    -static inline __u64 ___arch__swab64(__u64 x)
    +static inline __u64 __arch_swab64(__u64 x)
    {
    __u64 result;

    asm volatile("lrvgr %0,%1" : "=d" (result) : "d" (x));
    return result;
    }
    +#define HAVE_ARCH_SWAB64

    -static inline void ___arch__swab64s(__u64 *x)
    +static inline void __arch_swab64s(__u64 *x)
    {
    *x = ___arch__swab64p(x);
    }
    +#define HAVE_ARCH_SWAB64S
    #endif /* __s390x__ */

    -static inline __u32 ___arch__swab32p(const __u32 *x)
    +static inline __u32 __arch_swab32p(const __u32 *x)
    {
    __u32 result;

    @@ -53,25 +60,20 @@ static inline __u32 ___arch__swab32p(const __u32 *x)
    #endif /* __s390x__ */
    return result;
    }
    +#define HAVE_ARCH_SWAB32P

    -static inline __u32 ___arch__swab32(__u32 x)
    +#ifdef __s390x__
    +static inline __u32 __arch_swab32(__u32 x)
    {
    -#ifndef __s390x__
    - return ___arch__swab32p(&x);
    -#else /* __s390x__ */
    __u32 result;

    asm volatile("lrvr %0,%1" : "=d" (result) : "d" (x));
    return result;
    -#endif /* __s390x__ */
    -}
    -
    -static __inline__ void ___arch__swab32s(__u32 *x)
    -{
    - *x = ___arch__swab32p(x);
    }
    +#define HAVE_ARCH_SWAB32
    +#endif /* __s390x__ */

    -static __inline__ __u16 ___arch__swab16p(const __u16 *x)
    +static inline __u16 __arch_swab16p(const __u16 *x)
    {
    __u16 result;

    @@ -86,40 +88,8 @@ static __inline__ __u16 ___arch__swab16p(const __u16 *x)
    #endif /* __s390x__ */
    return result;
    }
    +#define HAVE_ARCH_SWAB16P

    -static __inline__ __u16 ___arch__swab16(__u16 x)
    -{
    - return ___arch__swab16p(&x);
    -}
    -
    -static __inline__ void ___arch__swab16s(__u16 *x)
    -{
    - *x = ___arch__swab16p(x);
    -}
    -
    -#ifdef __s390x__
    -#define __arch__swab64(x) ___arch__swab64(x)
    -#define __arch__swab64p(x) ___arch__swab64p(x)
    -#define __arch__swab64s(x) ___arch__swab64s(x)
    -#endif /* __s390x__ */
    -#define __arch__swab32(x) ___arch__swab32(x)
    -#define __arch__swab16(x) ___arch__swab16(x)
    -#define __arch__swab32p(x) ___arch__swab32p(x)
    -#define __arch__swab16p(x) ___arch__swab16p(x)
    -#define __arch__swab32s(x) ___arch__swab32s(x)
    -#define __arch__swab16s(x) ___arch__swab16s(x)
    -
    -#ifndef __s390x__
    -#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
    -# define __BYTEORDER_HAS_U64__
    -# define __SWAB_64_THRU_32__
    -#endif
    -#else /* __s390x__ */
    -#define __BYTEORDER_HAS_U64__
    -#endif /* __s390x__ */
    -
    -#endif /* __GNUC__ */
    -
    -#include <linux/byteorder/big_endian.h>
    +#include <linux/byteorder.h>

    #endif /* _S390_BYTEORDER_H */
    --
    1.5.6.3.569.ga9185



    \
     
     \ /
      Last update: 2008-07-18 02:17    [W:0.024 / U:31.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site