Merge branch 'x86/urgent' into x86/asm, before applying dependent patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/entry/entry_64_compat.S
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.c
index 641413d68a548ceda2ed90e86cd8c333d729e5f7,9469dfa556074db4dff41212a4873b31d5907772..09f9ff271df4ade02c1494c8d3e1edc38c7b310d
--- 1/arch/x86/kernel/cpu/perf_event.c
--- 2/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@@ -2190,13 -2194,13 +2194,13 @@@ static unsigned long get_segment_base(u
                if (idx > GDT_ENTRIES)
                        return 0;
  
-               desc = raw_cpu_ptr(gdt_page.gdt);
+               desc = raw_cpu_ptr(gdt_page.gdt) + idx;
        }
  
-       return get_desc_base(desc + idx);
+       return get_desc_base(desc);
  }
  
 -#ifdef CONFIG_COMPAT
 +#ifdef CONFIG_IA32_EMULATION
  
  #include <asm/compat.h>
  

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/xen/enlighten.c
Simple merge