git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.0' into x86/vdso
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
cpufeature.h
diff --git
a/arch/x86/include/asm/cpufeature.h
b/arch/x86/include/asm/cpufeature.h
index
71cc380
..
9929b35
100644
(file)
--- a/
arch/x86/include/asm/cpufeature.h
+++ b/
arch/x86/include/asm/cpufeature.h
@@
-331,8
+331,8
@@
static __always_inline __pure bool __static_cpu_has(u16 bit)
"2:\n"
".section .altinstructions,\"a\"\n"
_ASM_ALIGN "\n"
"2:\n"
".section .altinstructions,\"a\"\n"
_ASM_ALIGN "\n"
-
_ASM_PTR "1b
\n"
-
_ASM_PTR "0\n"
/* no replacement */
+
" .long 1b - .
\n"
+
" .long 0\n"
/* no replacement */
" .word %P0\n" /* feature bit */
" .byte 2b - 1b\n" /* source len */
" .byte 0\n" /* replacement len */
" .word %P0\n" /* feature bit */
" .byte 2b - 1b\n" /* source len */
" .byte 0\n" /* replacement len */
@@
-349,8
+349,8
@@
static __always_inline __pure bool __static_cpu_has(u16 bit)
"2:\n"
".section .altinstructions,\"a\"\n"
_ASM_ALIGN "\n"
"2:\n"
".section .altinstructions,\"a\"\n"
_ASM_ALIGN "\n"
-
_ASM_PTR "1b
\n"
-
_ASM_PTR "3f
\n"
+
" .long 1b - .
\n"
+
" .long 3f - .
\n"
" .word %P1\n" /* feature bit */
" .byte 2b - 1b\n" /* source len */
" .byte 4f - 3f\n" /* replacement len */
" .word %P1\n" /* feature bit */
" .byte 2b - 1b\n" /* source len */
" .byte 4f - 3f\n" /* replacement len */