diff options
author | Jan Beulich <jbeulich@novell.com> | 2006-08-30 13:37:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 19:05:15 -0400 |
commit | 61171b8dbd36b0cc34d3813a59a8e4dc2984414d (patch) | |
tree | 5c4dede0bddc19c1e564ebcd95976afcebe63a4f /include/asm-i386 | |
parent | 29fe5f3bafb644c33269fb0f2a719d4809a07332 (diff) |
[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 <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/alternative.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h index 96adbabec740..bb3b6317c810 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) {} | |||
116 | " .align 4\n" \ | 116 | " .align 4\n" \ |
117 | " .long 661b\n" /* label */ \ | 117 | " .long 661b\n" /* label */ \ |
118 | " .long 663f\n" /* new instruction */ \ | 118 | " .long 663f\n" /* new instruction */ \ |
119 | " .byte 0x68\n" /* X86_FEATURE_UP */ \ | 119 | " .byte " __stringify(X86_FEATURE_UP) "\n" \ |
120 | " .byte 662b-661b\n" /* sourcelen */ \ | 120 | " .byte 662b-661b\n" /* sourcelen */ \ |
121 | " .byte 664f-663f\n" /* replacementlen */ \ | 121 | " .byte 664f-663f\n" /* replacementlen */ \ |
122 | ".previous\n" \ | 122 | ".previous\n" \ |