projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86: fix x86 cpuid keys used in alternative_smp()
[powerpc.git]
/
include
/
asm-x86_64
/
alternative.h
diff --git
a/include/asm-x86_64/alternative.h
b/include/asm-x86_64/alternative.h
index
aa67bfd
..
709ad3f
100644
(file)
--- a/
include/asm-x86_64/alternative.h
+++ b/
include/asm-x86_64/alternative.h
@@
-4,6
+4,7
@@
#ifdef __KERNEL__
#include <linux/types.h>
#ifdef __KERNEL__
#include <linux/types.h>
+#include <asm/cpufeature.h>
struct alt_instr {
u8 *instr; /* original instruction */
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 */ \
" .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" \
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
".previous\n" \