[PATCH 3/5] x86, cpu: Remove gcc 3.x workarounds in <asm/cpufeature.h>

From: H. Peter Anvin
Date: Mon Sep 13 2010 - 16:15:45 EST


We no longer support gcc 3.x, so remove the workaround for it.

Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
arch/x86/include/asm/cpufeature.h | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 781a50b..830a94f 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -345,7 +345,6 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
#endif
}

-#if __GNUC__ >= 4
#define static_cpu_has(bit) \
( \
__builtin_constant_p(boot_cpu_has(bit)) ? \
@@ -354,12 +353,6 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
__static_cpu_has(bit) : \
boot_cpu_has(bit) \
)
-#else
-/*
- * gcc 3.x is too stupid to do the static test; fall back to dynamic.
- */
-#define static_cpu_has(bit) boot_cpu_has(bit)
-#endif

#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */

--
1.7.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/