diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:20 +0200 |
| commit | 9dda1658a9bd450d65da5153a2427955785d17c2 (patch) | |
| tree | c563b728d879c2b446a8f1c33ce351ffb1f1d34e /arch/x86/xen | |
| parent | b72e7464e4cf80117938e6adb8c22fdc1ca46d42 (diff) | |
| parent | a49976d14f780942dafafbbf16f891c27d385ea0 (diff) | |
| download | blackbird-op-linux-9dda1658a9bd450d65da5153a2427955785d17c2.tar.gz blackbird-op-linux-9dda1658a9bd450d65da5153a2427955785d17c2.zip | |
Merge branch 'x86/asm' into x86/core, to prepare for new patch
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/xen-asm_64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index 04529e620559..f22667abf7b9 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -114,7 +114,7 @@ RELOC(xen_sysret32, 1b+1) /* Normal 64-bit system call target */ ENTRY(xen_syscall_target) undo_xen_syscall - jmp system_call_after_swapgs + jmp entry_SYSCALL_64_after_swapgs ENDPROC(xen_syscall_target) #ifdef CONFIG_IA32_EMULATION @@ -122,13 +122,13 @@ ENDPROC(xen_syscall_target) /* 32-bit compat syscall target */ ENTRY(xen_syscall32_target) undo_xen_syscall - jmp ia32_cstar_target + jmp entry_SYSCALL_compat ENDPROC(xen_syscall32_target) /* 32-bit compat sysenter target */ ENTRY(xen_sysenter_target) undo_xen_syscall - jmp ia32_sysenter_target + jmp entry_SYSENTER_compat ENDPROC(xen_sysenter_target) #else /* !CONFIG_IA32_EMULATION */ |
