From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 25 Feb 2016 08:01:09 +0000 (+0100)
Subject: Merge branch 'ras/core' into core/objtool, to pick up the new exception table format
X-Git-Tag: v4.14-rc1~3588^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=319e305ca469d9484678d2916590005b08cc3b4b;p=platform%2Fkernel%2Flinux-rpi.git

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

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

319e305ca469d9484678d2916590005b08cc3b4b
diff --cc arch/x86/kernel/traps.c
index 410e8e2,211c11c..b0a3915
--- a/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);