diff --git a/[refs] b/[refs]
index d0df4526e9dc..8934795d3585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 637b180c23313f2964e0ef20f1ee375203866968
+refs/heads/master: ede6f5aea054d3fb67c78857f7abdee602302043
diff --git a/trunk/include/linux/swab.h b/trunk/include/linux/swab.h
index 9a2d33e0a98a..be5284d4a053 100644
--- a/trunk/include/linux/swab.h
+++ b/trunk/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