Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753748AbYJVNjl (ORCPT ); Wed, 22 Oct 2008 09:39:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751585AbYJVNjb (ORCPT ); Wed, 22 Oct 2008 09:39:31 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:39146 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501AbYJVNjb (ORCPT ); Wed, 22 Oct 2008 09:39:31 -0400 Date: Wed, 22 Oct 2008 09:37:14 -0400 From: Neil Horman To: Alexander van Heukelum Cc: Ingo Molnar , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, vgoyal@redhat.com, hbabu@us.ibm.com, hpa@zytor.com, akpm@linux-foundation.org, ebiederm@xmission.com, tglx@linutronix.de Subject: Re: [PATCH 7/7] i386, dumpstack: unify die() Message-ID: <20081022133714.GH18951@hmsreliant.think-freely.org> References: <1224669614-25863-1-git-send-email-heukelum@fastmail.fm> <1224669614-25863-2-git-send-email-heukelum@fastmail.fm> <1224669614-25863-3-git-send-email-heukelum@fastmail.fm> <1224669614-25863-4-git-send-email-heukelum@fastmail.fm> <1224669614-25863-5-git-send-email-heukelum@fastmail.fm> <1224669614-25863-6-git-send-email-heukelum@fastmail.fm> <1224669614-25863-7-git-send-email-heukelum@fastmail.fm> <1224669614-25863-8-git-send-email-heukelum@fastmail.fm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1224669614-25863-8-git-send-email-heukelum@fastmail.fm> User-Agent: Mutt/1.5.18 (2008-05-17) X-Spam-Score: -1.4 (-) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2324 Lines: 75 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 Acked-by: Neil Horman > --- > 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 * Software Engineer, Red Hat ****************************************************/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/