Merge branch 'ras/core' into core/objtool, to pick up the new exception table format

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

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

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

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc arch/x86/kernel/traps.c
index 410e8e2700c5813c99975125ce3906efc0f828a3,211c11c7bba4aaacc99f6e36aae379c60d87c3d4..b0a39159dc0d8cb2acb82714a4b17053296ec68d
--- 1/arch/x86/kernel/traps.c
--- 2/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@ -687,10 -696,10 +687,10 @@@ static void math_error(struct pt_regs *
  
        if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, SIGFPE) == NOTIFY_STOP)
                return;
 -      conditional_sti(regs);
 +      cond_local_irq_enable(regs);
  
        if (!user_mode(regs)) {
-               if (!fixup_exception(regs)) {
+               if (!fixup_exception(regs, trapnr)) {
                        task->thread.error_code = error_code;
                        task->thread.trap_nr = trapnr;
                        die(str, regs, error_code);

diff --cc arch/x86/mm/fault.c
Simple merge