From: Jan Beulich Date: Wed, 30 Aug 2006 17:37:10 +0000 (+0200) Subject: [PATCH] x86: fix x86 cpuid keys used in alternative_smp() X-Git-Tag: v2.6.18-rc6~49 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61171b8dbd36b0cc34d3813a59a8e4dc2984414d;p=linux-2.6 [PATCH] x86: fix x86 cpuid keys used in alternative_smp() By hard-coding the cpuid keys for alternative_smp() rather than using the symbolic constant it turned out that incorrect values were used on both i386 (0x68 instead of 0x69) and x86-64 (0x66 instead of 0x68). Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h index 96adbabec7..bb3b6317c8 100644 --- a/include/asm-i386/alternative.h +++ b/include/asm-i386/alternative.h @@ -116,7 +116,7 @@ static inline void alternatives_smp_switch(int smp) {} " .align 4\n" \ " .long 661b\n" /* label */ \ " .long 663f\n" /* new instruction */ \ - " .byte 0x68\n" /* X86_FEATURE_UP */ \ + " .byte " __stringify(X86_FEATURE_UP) "\n" \ " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ ".previous\n" \ diff --git a/include/asm-x86_64/alternative.h b/include/asm-x86_64/alternative.h index aa67bfd1b3..709ad3f0d3 100644 --- a/include/asm-x86_64/alternative.h +++ b/include/asm-x86_64/alternative.h @@ -4,6 +4,7 @@ #ifdef __KERNEL__ #include +#include struct alt_instr { u8 *instr; /* original instruction */ @@ -130,7 +131,7 @@ static inline void alternatives_smp_switch(int smp) {} " .align 8\n" \ " .quad 661b\n" /* label */ \ " .quad 663f\n" /* new instruction */ \ - " .byte 0x66\n" /* X86_FEATURE_UP */ \ + " .byte " __stringify(X86_FEATURE_UP) "\n" \ " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ ".previous\n" \