summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-05-27 14:30:29 +0800
committerTony Luck <tony.luck@intel.com>2013-06-03 15:47:42 -0700
commit169ec523c34212f6e382186bce88f17eba4cad49 (patch)
tree5362ef1bcab5f228934d81dfaec0b8a3058b35b0 /arch
parentd683b96b072dc4680fc74964eca77e6a23d1fa6e (diff)
[IA64] Fix trap #45 handling
In this case, the original author did not provide the related reason string for die_if_kernel(), so the 'buf' is not initialized. The original author wants to generic a 'SIGSEGV' and 'return', not want to 'break' to fall to die. [Probably irrelevent since we no longer support IA-32 execution. -Tony] Signed-off-by: Chen Gang <gang.chen@asianux.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index f7f9f9c6caf..d3636e67a98 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -630,7 +630,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
printk(KERN_ERR " iip - 0x%lx, ifa - 0x%lx, isr - 0x%lx\n",
iip, ifa, isr);
force_sig(SIGSEGV, current);
- break;
+ return;
case 46:
printk(KERN_ERR "Unexpected IA-32 intercept trap (Trap 46)\n");