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>

diff --cc arch/x86/entry/entry_64_compat.S
index 8997383ba170f5942c1798c5f6367e52e6f66f0a,a7e257d9cb90b9f34ecb03180fec8c54f2afd82f..a9360d40fb7fd5f518077cc2d9aaa63cfd4853aa
--- 1/arch/x86/entry/entry_64_compat.S
--- 2/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 */
 -      RESTORE_RSI_RDI
+       movq    RAX(%rsp), %rax
 +      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/kernel/signal.c
Simple merge

diff --cc arch/x86/kernel/step.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/math-emu/get_address.c
index a2eefb121a5f2408c7111b9eda132aa62711391c,8300db71c2a62681006e137350961742190ec9dc..8db26591d91a206d457974c5e2e96ba621e4923a
--- 1/arch/x86/math-emu/get_address.c
--- 2/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"

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge