Commit 871d3779 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

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: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e06ca430

arch/x86/kernel/dumpstack_32.c

+3 −7
Original line number Diff line number Diff line
@@ -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");

	}



	oops_end(flags, regs, sig);

}

arch/x86/kernel/dumpstack_64.c

+5 −1
Original line number Diff line number Diff line
@@ -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))

CRA Git | Maintained and supported by SUSTech CRA and CCSE