aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 21:17:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 21:17:57 -0800
commitede6f5aea054d3fb67c78857f7abdee602302043 (patch)
tree45362cd6f23e2eddc0004c96c46bca4ad82c9bd3 /include
parent637b180c23313f2964e0ef20f1ee375203866968 (diff)
downloadmrst-s0i3-test-ede6f5aea054d3fb67c78857f7abdee602302043.tar.gz
mrst-s0i3-test-ede6f5aea054d3fb67c78857f7abdee602302043.tar.xz
mrst-s0i3-test-ede6f5aea054d3fb67c78857f7abdee602302043.zip
Fix up 64-bit byte swaps for most 32-bit architectures
The __SWAB_64_THRU_32__ case of a 64-bit byte swap was depending on the no-longer-existant ___swab32() method (three underscores). We got rid of some of the worst indirection and complexity, and now it should just use the 32-bit swab function that was defined right above it. Reported-and-tested-by: Nicolas Pitre <nico@cam.org> Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/swab.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swab.h b/include/linux/swab.h
index 9a2d33e0a98..be5284d4a05 100644
--- a/include/linux/swab.h
+++ b/include/linux/swab.h
@@ -68,7 +68,7 @@ static inline __attribute_const__ __u64 __fswab64(__u64 val)
#elif defined(__SWAB_64_THRU_32__)
__u32 h = val >> 32;
__u32 l = val & ((1ULL << 32) - 1);
- return (((__u64)___swab32(l)) << 32) | ((__u64)(___swab32(h)));
+ return (((__u64)__fswab32(l)) << 32) | ((__u64)(__fswab32(h)));
#else
return ___constant_swab64(val);
#endif