From 558bb9a651f06385e2cfe6143ba35c2b218afde0 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 10 Nov 2009 15:13:15 +0000 Subject: [PATCH] --- yaml --- r: 175796 b: refs/heads/master c: a0592d42fe3e12966db02f5c41f1edae2e59c490 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/traps.c | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 1df784ee718a..36c4f3b3b747 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3aa565f53c396914a9406388efaa238e9c937fc6 +refs/heads/master: a0592d42fe3e12966db02f5c41f1edae2e59c490 diff --git a/trunk/arch/powerpc/kernel/traps.c b/trunk/arch/powerpc/kernel/traps.c index 6f0ae1a9bfae..a81c7438d341 100644 --- a/trunk/arch/powerpc/kernel/traps.c +++ b/trunk/arch/powerpc/kernel/traps.c @@ -198,28 +198,6 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) info.si_code = code; info.si_addr = (void __user *) addr; force_sig_info(signr, &info, current); - - /* - * Init gets no signals that it doesn't have a handler for. - * That's all very well, but if it has caused a synchronous - * exception and we ignore the resulting signal, it will just - * generate the same exception over and over again and we get - * nowhere. Better to kill it and let the kernel panic. - */ - if (is_global_init(current)) { - __sighandler_t handler; - - spin_lock_irq(¤t->sighand->siglock); - handler = current->sighand->action[signr-1].sa.sa_handler; - spin_unlock_irq(¤t->sighand->siglock); - if (handler == SIG_DFL) { - /* init has generated a synchronous exception - and it doesn't have a handler for the signal */ - printk(KERN_CRIT "init has generated signal %d " - "but has no handler for it\n", signr); - do_exit(signr); - } - } } #ifdef CONFIG_PPC64