diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 19:24:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 19:24:17 -0400 |
| commit | 66cd55d2b903643cbd019ef97a5305d9428d3865 (patch) | |
| tree | 454a5af22b1aaf8fe62689974342a784f6f38822 /arch/x86/kernel/entry_32.S | |
| parent | 75cb5fdce29c77ec54db45f0c6be7cc5715f8e15 (diff) | |
| parent | 3b770a2128423a687e6e9c57184a584fb4ba4c77 (diff) | |
Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, alternatives: BUG on encountering an invalid CPU feature number
x86, alternatives: Fix one more open-coded 8-bit alternative number
x86, alternatives: Use 16-bit numbers for cpufeature index
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 258e93fa2630..227d00920d2f 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -913,7 +913,7 @@ ENTRY(simd_coprocessor_error) | |||
| 913 | .balign 4 | 913 | .balign 4 |
| 914 | .long 661b | 914 | .long 661b |
| 915 | .long 663f | 915 | .long 663f |
| 916 | .byte X86_FEATURE_XMM | 916 | .word X86_FEATURE_XMM |
| 917 | .byte 662b-661b | 917 | .byte 662b-661b |
| 918 | .byte 664f-663f | 918 | .byte 664f-663f |
| 919 | .previous | 919 | .previous |