summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-06-05 11:47:18 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2013-06-12 15:16:18 -0700
commitc8a22d19dd238ede87aa0ac4f7dbea8da039b9c1 (patch)
tree2b3b8a48e1b52e0be443283b7ce3e537034ebe35 /arch
parentb1983b0a7578de09211a696802edab83fd253303 (diff)
downloadblackbird-obmc-linux-c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1.tar.gz
blackbird-obmc-linux-c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1.zip
x86: Fix typo in kexec register clearing
Fixes a typo in register clearing code. Thanks to PaX Team for fixing this originally, and James Troup for pointing it out. Signed-off-by: Kees Cook <keescook@chromium.org> Link: http://lkml.kernel.org/r/20130605184718.GA8396@www.outflux.net Cc: <stable@vger.kernel.org> v2.6.30+ Cc: PaX Team <pageexec@freemail.hu> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/relocate_kernel_64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 7a6f3b3be3cf..f2bb9c96720a 100644
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -160,7 +160,7 @@ identity_mapped:
xorq %rbp, %rbp
xorq %r8, %r8
xorq %r9, %r9
- xorq %r10, %r9
+ xorq %r10, %r10
xorq %r11, %r11
xorq %r12, %r12
xorq %r13, %r13
OpenPOWER on IntegriCloud