projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
alternative-asm.h
diff --git
a/arch/x86/include/asm/alternative-asm.h
b/arch/x86/include/asm/alternative-asm.h
index
091508b
..
952bd01
100644
(file)
--- a/
arch/x86/include/asm/alternative-asm.h
+++ b/
arch/x86/include/asm/alternative-asm.h
@@
-4,10
+4,10
@@
#ifdef CONFIG_SMP
.macro LOCK_PREFIX
-
1:
lock
+
672:
lock
.section .smp_locks,"a"
.balign 4
- .long
1
b - .
+ .long
672
b - .
.previous
.endm
#else