target/linux/etrax-2.6/patches/cris/017-uclibc-swab.patch

   1 Binary files linux-2.6.19.2.orig/include/linux/byteorder/.swab.h.swp and linux-2.6.19.2/include/linux/byteorder/.swab.h.swp differ
   2 diff -urN linux-2.6.19.2.orig/include/linux/byteorder/swab.h linux-2.6.19.2/include/linux/byteorder/swab.h
   3 --- linux-2.6.19.2.orig/include/linux/byteorder/swab.h  2007-06-02 03:13:27.000000000 +0200
   4 +++ linux-2.6.19.2/include/linux/byteorder/swab.h       2007-06-02 03:14:52.000000000 +0200
   5 @@ -20,6 +20,8 @@
   6  /* casts are necessary for constants, because we never know how for sure
   7   * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
   8   */
   9 +
  10 +#ifndef _BITS_BYTESWAP_H
  11  #define ___swab16(x) \
  12  ({ \
  13         __u16 __x = (x); \
  14 @@ -37,6 +39,8 @@
  15                 (((__u32)(__x) & (__u32)0x00ff0000UL) >>  8) | \
  16                 (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \
  17  })
  18 +#endif
  19 +
  20
  21  #define ___swab64(x) \
  22  ({ \
  23 @@ -129,11 +133,13 @@
  24  #  define __swab64(x) __fswab64(x)
  25  #endif /* OPTIMIZE */
  26
  27 -
  28 +#ifndef _BITS_BYTESWAP_H
  29  static __inline__ __attribute_const__ __u16 __fswab16(__u16 x)
  30  {
  31         return __arch__swab16(x);
  32  }
  33 +#endif
  34 +
  35  static __inline__ __u16 __swab16p(const __u16 *x)
  36  {
  37         return __arch__swab16p(x);
  38 @@ -143,10 +149,12 @@
  39         __arch__swab16s(addr);
  40  }
  41
  42 +#ifndef _BITS_BYTESWAP_H
  43  static __inline__ __attribute_const__ __u32 __fswab32(__u32 x)
  44  {
  45         return __arch__swab32(x);
  46  }
  47 +#endif
  48  static __inline__ __u32 __swab32p(const __u32 *x)
  49  {
  50         return __arch__swab32p(x);