summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2014-03-12 15:13:03 +0100
committerH. Peter Anvin <hpa@linux.intel.com>2014-03-13 15:32:44 -0700
commit5314feebabd92535a16295a8067b3fd79815cd16 (patch)
tree268d579345d844c77b53fdc18f814e8fde1f52d8
parent3e920b532a0f49d05e4c0f7d1b46b0ab8f471e09 (diff)
downloadop-kernel-dev-5314feebabd92535a16295a8067b3fd79815cd16.zip
op-kernel-dev-5314feebabd92535a16295a8067b3fd79815cd16.tar.gz
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>
-rw-r--r--arch/x86/kernel/crash.c2
1 files changed, 0 insertions, 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;
OpenPOWER on IntegriCloud