From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, hpa@linux.intel.com, bp@suse.de
Subject: [tip:x86/cleanups] x86, crash: Unify ifdef
Date: Thu, 13 Mar 2014 15:36:52 -0700 [thread overview]
Message-ID: <tip-5314feebabd92535a16295a8067b3fd79815cd16@git.kernel.org> (raw)
In-Reply-To: <1394633584-5509-3-git-send-email-bp@alien8.de>
Commit-ID: 5314feebabd92535a16295a8067b3fd79815cd16
Gitweb: http://git.kernel.org/tip/5314feebabd92535a16295a8067b3fd79815cd16
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 12 Mar 2014 15:13:03 +0100
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 13 Mar 2014 15:32:44 -0700
x86, crash: Unify ifdef
Merge two back-to-back CONFIG_X86_32 ifdefs into one.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1394633584-5509-3-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/kernel/crash.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index a57902e..507de80 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -57,9 +57,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
{
#ifdef CONFIG_X86_32
struct pt_regs fixed_regs;
-#endif
-#ifdef CONFIG_X86_32
if (!user_mode_vm(regs)) {
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
next prev parent reply other threads:[~2014-03-13 22:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 14:13 [PATCH 0/3] x86: Misc small fixes Borislav Petkov
2014-03-12 14:13 ` [PATCH 1/3] x86, boot: Correct max ramdisk size name Borislav Petkov
2014-03-13 22:36 ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
2014-03-12 14:13 ` [PATCH 2/3] x86, crash: Unify ifdef Borislav Petkov
2014-03-13 22:36 ` tip-bot for Borislav Petkov [this message]
2014-03-12 14:13 ` [PATCH 3/3] x86, pageattr: Correct WBINVD spelling in comment Borislav Petkov
2014-03-13 22:37 ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-5314feebabd92535a16295a8067b3fd79815cd16@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome