[PATCH 7/7] i386, dumpstack: unify die()

[Neil Horman]

On Wed, Oct 22, 2008 at 12:00:14PM +0200, Alexander van Heukelum wrote:
> 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 at fastmail.fm>

Acked-by: Neil Horman <nhorman at tuxdriver.com>

> ---
>  arch/x86/kernel/dumpstack_32.c |   10 +++-------
>  arch/x86/kernel/dumpstack_64.c |    6 +++++-
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
> index e91ae34..f2046c5 100644
> --- 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 831e1e1..28c67aa 100644
> --- 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))
> -- 
> 1.5.4.3
> 
> 

-- 
/****************************************************
 * Neil Horman <nhorman at tuxdriver.com>
 * Software Engineer, Red Hat
 ****************************************************/