diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:00:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:00:10 -0700 |
commit | 26a5c0dfbc9c4b1c455821c0a0ea6d6116082397 (patch) | |
tree | b63fde090696e2be3224e15ab6c9d4245f349d3f /arch/x86/kernel | |
parent | 54cad6270a30edc75276c653ccb81dc313f0fcde (diff) | |
parent | b82ad3d3944193e5f95319c30fd24e39d0d7b510 (diff) |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Various smaller cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, pageattr: Correct WBINVD spelling in comment
x86, crash: Unify ifdef
x86, boot: Correct max ramdisk size name
Diffstat (limited to 'arch/x86/kernel')
-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) { #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; |