diff options
author | Borislav Petkov <bp@suse.de> | 2014-03-12 10:13:03 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-03-13 18:32:44 -0400 |
commit | 5314feebabd92535a16295a8067b3fd79815cd16 (patch) | |
tree | 268d579345d844c77b53fdc18f814e8fde1f52d8 | |
parent | 3e920b532a0f49d05e4c0f7d1b46b0ab8f471e09 (diff) |
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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index a57902efe2d5..507de8066594 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) | |||
57 | { | 57 | { |
58 | #ifdef CONFIG_X86_32 | 58 | #ifdef CONFIG_X86_32 |
59 | struct pt_regs fixed_regs; | 59 | struct pt_regs fixed_regs; |
60 | #endif | ||
61 | 60 | ||
62 | #ifdef CONFIG_X86_32 | ||
63 | if (!user_mode_vm(regs)) { | 61 | if (!user_mode_vm(regs)) { |
64 | crash_fixup_ss_esp(&fixed_regs, regs); | 62 | crash_fixup_ss_esp(&fixed_regs, regs); |
65 | regs = &fixed_regs; | 63 | regs = &fixed_regs; |