x86/asm/entry/64: Rename 'old_rsp' to 'rsp_scratch'

Make clear that the usage of PER_CPU(old_rsp) is purely temporary,
by renaming it to 'rsp_scratch'.

Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Will Drewry <wad@chromium.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
index 53adefda4275..985fc3ee0973 100644
--- a/arch/x86/xen/xen-asm_64.S
+++ b/arch/x86/xen/xen-asm_64.S
@@ -68,11 +68,11 @@ ENTRY(xen_sysret64)
          * We're already on the usermode stack at this point, but
          * still with the kernel gs, so we can easily switch back
          */
-        movq %rsp, PER_CPU_VAR(old_rsp)
+        movq %rsp, PER_CPU_VAR(rsp_scratch)
         movq PER_CPU_VAR(kernel_stack), %rsp
 
         pushq $__USER_DS
-        pushq PER_CPU_VAR(old_rsp)
+        pushq PER_CPU_VAR(rsp_scratch)
         pushq %r11
         pushq $__USER_CS
         pushq %rcx
@@ -87,11 +87,11 @@ ENTRY(xen_sysret32)
          * We're already on the usermode stack at this point, but
          * still with the kernel gs, so we can easily switch back
          */
-        movq %rsp, PER_CPU_VAR(old_rsp)
+        movq %rsp, PER_CPU_VAR(rsp_scratch)
         movq PER_CPU_VAR(kernel_stack), %rsp
 
         pushq $__USER32_DS
-        pushq PER_CPU_VAR(old_rsp)
+        pushq PER_CPU_VAR(rsp_scratch)
         pushq %r11
         pushq $__USER32_CS
         pushq %rcx