]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
x86, crash: Unify ifdef
authorBorislav Petkov <bp@suse.de>
Wed, 12 Mar 2014 14:13:03 +0000 (15:13 +0100)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 13 Mar 2014 22:32:44 +0000 (15:32 -0700)
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

index a57902efe2d597be4af85c9d52d995360d54dadb..507de80665942b87a148e032fd8aeedfeb76c70b 100644 (file)
@@ -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;