diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
| commit | a5dd19249607474ed680f16b4f5e8477d2b68689 (patch) | |
| tree | 1aeeef053773c07bc02f3aa637febc80ceb96732 /arch/x86/entry | |
| parent | x86/vdso: Emit a GNU hash (diff) | |
| parent | Revert "sched/x86_64: Don't save flags on context switch" (diff) | |
| download | linux-a5dd19249607474ed680f16b4f5e8477d2b68689.tar.xz linux-a5dd19249607474ed680f16b4f5e8477d2b68689.zip | |
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/entry_64_compat.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index 8997383ba170..a9360d40fb7f 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -140,6 +140,7 @@ sysexit_from_sys_call: */ andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS) movl RIP(%rsp), %ecx /* User %eip */ + movq RAX(%rsp), %rax movl RSI(%rsp), %esi movl RDI(%rsp), %edi xorl %edx, %edx /* Do not leak kernel information */ @@ -220,7 +221,6 @@ sysexit_from_sys_call: 1: setbe %al /* 1 if error, 0 if not */ movzbl %al, %edi /* zero-extend that into %edi */ call __audit_syscall_exit - movq RAX(%rsp), %rax /* reload syscall return value */ movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %edi DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF @@ -371,6 +371,7 @@ sysretl_from_sys_call: movl RDI(%rsp), %edi movl RIP(%rsp), %ecx movl EFLAGS(%rsp), %r11d + movq RAX(%rsp), %rax xorq %r10, %r10 xorq %r9, %r9 xorq %r8, %r8 |