diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /arch/x86/kernel/crash.c | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
Diffstat (limited to 'arch/x86/kernel/crash.c')
| -rw-r--r-- | arch/x86/kernel/crash.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 0553a34fa0df..a618fcd2c07d 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
| @@ -182,8 +182,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs) | |||
| 182 | crash_save_cpu(regs, safe_smp_processor_id()); | 182 | crash_save_cpu(regs, safe_smp_processor_id()); |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | #ifdef CONFIG_X86_64 | 185 | #ifdef CONFIG_KEXEC_FILE |
| 186 | |||
| 187 | static int get_nr_ram_ranges_callback(unsigned long start_pfn, | 186 | static int get_nr_ram_ranges_callback(unsigned long start_pfn, |
| 188 | unsigned long nr_pfn, void *arg) | 187 | unsigned long nr_pfn, void *arg) |
| 189 | { | 188 | { |
| @@ -696,5 +695,4 @@ int crash_load_segments(struct kimage *image) | |||
| 696 | 695 | ||
| 697 | return ret; | 696 | return ret; |
| 698 | } | 697 | } |
| 699 | 698 | #endif /* CONFIG_KEXEC_FILE */ | |
| 700 | #endif /* CONFIG_X86_64 */ | ||