i386, dumpstack: unify die()

[karo-tx-linux.git] / arch / x86 / kernel / dumpstack_32.c

diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index e91ae34f9684fae97e0ed7fecd4f623488a5a733..f2046c5752d0b032ffd472329ef88f59c990e932 100644 (file)
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -378,15 +378,11 @@ void die(const char *str, struct pt_regs *regs, long err)
        unsigned long flags = oops_begin();
        int sig = SIGSEGV;
 
-       if (die_nest_count < 3) {
+       if (!user_mode_vm(regs))
                report_bug(regs->ip, regs);
 
-               if (__die(str, regs, err))
-                       sig = 0;
-       } else {
-               printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
-       }
-
+       if (__die(str, regs, err))
+               sig = 0;
        oops_end(flags, regs, sig);
 }