diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:17 -0700 |
| commit | 66cd55d2b903643cbd019ef97a5305d9428d3865 (patch) | |
| tree | 454a5af22b1aaf8fe62689974342a784f6f38822 /arch/x86/lib/copy_user_64.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/lib/copy_user_64.S')
| -rw-r--r-- | arch/x86/lib/copy_user_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 71100c98e33..a460158b5ac 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S @@ -29,7 +29,7 @@ .align 8 .quad 0b .quad 2b - .byte \feature /* when feature is set */ + .word \feature /* when feature is set */ .byte 5 .byte 5 .previous |