diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-01-19 00:38:58 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-19 00:38:58 +0900 |
| commit | 3d1e42a7cf945e289d6ba26159aa0e2b0645401b (patch) | |
| tree | 0b020226f5fce3abecf74e6680224ecb96fd18a8 /arch/x86/xen | |
| parent | 9af45651f1f7c89942e016a1a00a7ebddfa727f8 (diff) | |
| download | blackbird-op-linux-3d1e42a7cf945e289d6ba26159aa0e2b0645401b.tar.gz blackbird-op-linux-3d1e42a7cf945e289d6ba26159aa0e2b0645401b.zip | |
x86-64: Move oldrsp from PDA to per-cpu.
tj: * in asm-offsets_64.c, pda.h inclusion shouldn't be removed as pda
is still referenced in the file
* s/oldrsp/old_rsp/
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/xen-asm_64.S | 8 |
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 5a23e8993678..d6fc51f4ce85 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -194,11 +194,11 @@ RELOC(xen_sysexit, 1b+1) 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, %gs:pda_oldrsp + movq %rsp, PER_CPU_VAR(old_rsp) movq PER_CPU_VAR(kernel_stack),%rsp pushq $__USER_DS - pushq %gs:pda_oldrsp + pushq PER_CPU_VAR(old_rsp) pushq %r11 pushq $__USER_CS pushq %rcx @@ -211,11 +211,11 @@ RELOC(xen_sysret64, 1b+1) 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, %gs:pda_oldrsp + movq %rsp, PER_CPU_VAR(old_rsp) movq PER_CPU_VAR(kernel_stack), %rsp pushq $__USER32_DS - pushq %gs:pda_oldrsp + pushq PER_CPU_VAR(old_rsp) pushq %r11 pushq $__USER32_CS pushq %rcx |
