diff --git a/[refs] b/[refs] index 7fc5b7f91fc8..8b052b16ecc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c016e2257acd00a7ffd87fa1eec896138563d1aa +refs/heads/master: 12822bc272e857544476cef9175462711899008b diff --git a/trunk/include/asm-ppc64/byteorder.h b/trunk/include/asm-ppc64/byteorder.h index 80327532de64..8b57da62b674 100644 --- a/trunk/include/asm-ppc64/byteorder.h +++ b/trunk/include/asm-ppc64/byteorder.h @@ -40,7 +40,6 @@ static __inline__ void st_le32(volatile __u32 *addr, const __u32 val) __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr)); } -#if 0 static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value) { __u16 result; @@ -63,17 +62,8 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value) return result; } -static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value) -{ - __u64 result; -#error implement me -} - #define __arch__swab16(x) ___arch__swab16(x) #define __arch__swab32(x) ___arch__swab32(x) -#define __arch__swab64(x) ___arch__swab64(x) - -#endif /* The same, but returns converted value from the location pointer by addr. */ #define __arch__swab16p(addr) ld_le16(addr)