From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 18 Aug 2015 07:39:47 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5dd19249607474ed680f16b4f5e8477d2b68689;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

a5dd19249607474ed680f16b4f5e8477d2b68689
diff --cc arch/x86/entry/entry_64_compat.S
index 8997383ba170,a7e257d9cb90..a9360d40fb7f
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@@ -140,8 -140,8 +140,9 @@@ 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
 -	RESTORE_RSI_RDI
 +	movl	RSI(%rsp), %esi
 +	movl	RDI(%rsp), %edi
  	xorl	%edx, %edx		/* Do not leak kernel information */
  	xorq	%r8, %r8
  	xorq	%r9, %r9
@@@ -366,11 -365,10 +366,12 @@@ cstar_dispatch
  
  sysretl_from_sys_call:
  	andl	$~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
 -	RESTORE_RSI_RDI_RDX
 +	movl	RDX(%rsp), %edx
 +	movl	RSI(%rsp), %esi
 +	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
diff --cc arch/x86/math-emu/get_address.c
index a2eefb121a5f,8300db71c2a6..8db26591d91a
--- a/arch/x86/math-emu/get_address.c
+++ b/arch/x86/math-emu/get_address.c
@@@ -20,8 -20,6 +20,7 @@@
  #include <linux/stddef.h>
  
  #include <asm/uaccess.h>
- #include <asm/desc.h>
 +#include <asm/vm86.h>
  
  #include "fpu_system.h"
  #include "exception.h"