From 0c749052d927248e53b111a47ac8013e3e408d57 Mon Sep 17 00:00:00 2001 From: David Daney Date: Mon, 29 Jun 2009 09:54:15 -0700 Subject: [PATCH] --- yaml --- r: 154855 b: refs/heads/master c: b53d4d1f8d522342e66f79b8b49a19835071fed4 h: refs/heads/master i: 154853: 38c12dc83f7a97f68f4324f5e216af4ad7d85b0f 154851: 373354ad4566e5928faeb50f1b4bfbc3a157aafc 154847: 15bb5efcc1fbc0b4222f404ccce6fbad8fb105c6 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/swab.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 847bc54dd173..21cbbad56fb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27fdd325dace4a1ebfa10e93ba6f3d25f25df674 +refs/heads/master: b53d4d1f8d522342e66f79b8b49a19835071fed4 diff --git a/trunk/arch/mips/include/asm/swab.h b/trunk/arch/mips/include/asm/swab.h index 99993c0d6c12..97c2f81b4b43 100644 --- a/trunk/arch/mips/include/asm/swab.h +++ b/trunk/arch/mips/include/asm/swab.h @@ -38,7 +38,11 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) } #define __arch_swab32 __arch_swab32 -#ifdef CONFIG_CPU_MIPS64_R2 +/* + * Having already checked for CONFIG_CPU_MIPSR2, enable the + * optimized version for 64-bit kernel on r2 CPUs. + */ +#ifdef CONFIG_64BIT static inline __attribute_const__ __u64 __arch_swab64(__u64 x) { __asm__( @@ -50,6 +54,6 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x) return x; } #define __arch_swab64 __arch_swab64 -#endif /* CONFIG_CPU_MIPS64_R2 */ +#endif /* CONFIG_64BIT */ #endif /* CONFIG_CPU_MIPSR2 */ #endif /* _ASM_SWAB_H */