git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
entry_32.S
diff --git
a/arch/x86/kernel/entry_32.S
b/arch/x86/kernel/entry_32.S
index 258e93fa26304d08fddcc5f9b75f5ff0757eafba..227d00920d2f8eaa1d90340ced0261ffe0a8f859 100644
(file)
--- a/
arch/x86/kernel/entry_32.S
+++ b/
arch/x86/kernel/entry_32.S
@@
-913,7
+913,7
@@
ENTRY(simd_coprocessor_error)
.balign 4
.long 661b
.long 663f
- .
byte
X86_FEATURE_XMM
+ .
word
X86_FEATURE_XMM
.byte 662b-661b
.byte 664f-663f
.previous