projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
mips
/
include
/
uapi
/
asm
/
swab.h
diff --git
a/arch/mips/include/uapi/asm/swab.h
b/arch/mips/include/uapi/asm/swab.h
index
97c2f81
..
ac9a8f9
100644
(file)
--- a/
arch/mips/include/uapi/asm/swab.h
+++ b/
arch/mips/include/uapi/asm/swab.h
@@
-13,7
+13,7
@@
#define __SWAB_64_THRU_32__
#define __SWAB_64_THRU_32__
-#if
def CONFIG_CPU_MIPSR2
+#if
defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
{
static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
{
@@
-39,10
+39,10
@@
static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
#define __arch_swab32 __arch_swab32
/*
#define __arch_swab32 __arch_swab32
/*
- * Having already checked for
CONFIG_CPU_MIPSR2, enable the
- *
optimized version for
64-bit kernel on r2 CPUs.
+ * Having already checked for
MIPS R2, enable the optimized version for
+ * 64-bit kernel on r2 CPUs.
*/
*/
-#ifdef
CONFIG_64BIT
+#ifdef
__mips64
static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
{
__asm__(
static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
{
__asm__(
@@
-54,6
+54,6
@@
static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
return x;
}
#define __arch_swab64 __arch_swab64
return x;
}
#define __arch_swab64 __arch_swab64
-#endif /*
CONFIG_64BIT
*/
-#endif /*
CONFIG_CPU_MIPSR2
*/
+#endif /*
__mips64
*/
+#endif /*
MIPS R2 or newer
*/
#endif /* _ASM_SWAB_H */
#endif /* _ASM_SWAB_H */