Messages in this thread Patch in this message | | | Date | Thu, 13 Mar 2014 15:36:52 -0700 | From | tip-bot for Borislav Petkov <> | Subject | [tip:x86/cleanups] x86, crash: Unify ifdef |
| |
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;
| |