Skip to contentSkip to conversation

x86, cpufeature: Suppress compiler warning with gcc 3.x

tip:x86/urgent tip-bot for Tetsuo Handa 1 participant 1 message Sep 13, 2010 1 message not in the archive x86

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Commit-ID:  2fd818642a3c3a257f3b1262145a52bc1bfebd26
Gitweb:     http://git.kernel.org/tip/2fd818642a3c3a257f3b1262145a52bc1bfebd26
Author:     Tetsuo Handa <[email protected]>
AuthorDate: Mon, 30 Aug 2010 09:45:40 +0900
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 13 Sep 2010 14:48:41 -0700

x86, cpufeature: Suppress compiler warning with gcc 3.x

Gcc 3.x generates a warning

arch/x86/include/asm/cpufeature.h: In function `__static_cpu_has':
arch/x86/include/asm/cpufeature.h:326: warning: asm operand 1 probably doesn't match constraints

on each file.
But static_cpu_has() for gcc 3.x does not need __static_cpu_has().

LKML-Reference: <[email protected]>

---
 arch/x86/include/asm/cpufeature.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/cpufeature.h +2 -2
index 781a50b..c6fbb7b 100644
@@ -296,6 +296,7 @@ extern const char * const x86_power_flags[32];
 
 #endif /* CONFIG_X86_64 */
 
+#if __GNUC__ >= 4
 /*
  * Static testing of CPU features.  Used the same as boot_cpu_has().
  * These are only valid after alternatives have run, but will statically
@@ -304,7 +305,7 @@ extern const char * const x86_power_flags[32];
  */
 static __always_inline __pure bool __static_cpu_has(u16 bit)
 {
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#if __GNUC__ > 4 || __GNUC_MINOR__ >= 5
 		asm goto("1: jmp %l[t_no]\n"
 			 "2:\n"
 			 ".section .altinstructions,\"a\"\n"
@@ -345,7 +346,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)) ?		\