i386, dumpstack: unify die()

Make i386's die() equal to x86_64's version.

Whitespace-only changes on x86_64, to make it equal to i386's
version. (user_mode and user_mode_vm are equal on x86_64.)

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

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);
 }
 

diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 831e1e159cb4eef3ff178066f1c74fdda7378f5c..28c67aae55622be638b9f77b4bb9baf70f791bf9 100644 (file)
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -506,12 +506,16 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
        return 0;
 }
 
+/*
+ * This is gone through when something in the kernel has done something bad
+ * and is about to be terminated:
+ */
 void die(const char *str, struct pt_regs *regs, long err)
 {
        unsigned long flags = oops_begin();
        int sig = SIGSEGV;
 
-       if (!user_mode(regs))
+       if (!user_mode_vm(regs))
                report_bug(regs->ip, regs);
 
        if (__die(str, regs, err))