diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 20:48:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 20:48:19 +0300 |
| commit | 24ee25a6da84d83a25d93af52b5fef7407030b20 (patch) | |
| tree | 7ffb1f27b7d38134fa2723ef695b59a452a6a17c /arch/x86/include/asm/crash.h | |
| parent | 64d6a12094f35d644540c15440874723b1887f9d (diff) | |
| parent | 9eff303725da6530b615e9258f696149baa51df6 (diff) | |
| download | linux-24ee25a6da84d83a25d93af52b5fef7407030b20.tar.xz | |
Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kdump updates from Ingo Molnar:
"This solves a kdump artifact where encrypted memory contents are
dumped, instead of unencrypted ones.
The solution also happens to simplify the kdump code, to everyone's
delight"
* 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/crash: Align function arguments on opening braces
x86/kdump: Remove the backup region handling
x86/kdump: Always reserve the low 1M when the crashkernel option is specified
x86/crash: Add a forward declaration of struct kimage
Diffstat (limited to 'arch/x86/include/asm/crash.h')
| -rw-r--r-- | arch/x86/include/asm/crash.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h index 089b2850f9d1..f58de66091e5 100644 --- a/arch/x86/include/asm/crash.h +++ b/arch/x86/include/asm/crash.h @@ -2,9 +2,17 @@ #ifndef _ASM_X86_CRASH_H #define _ASM_X86_CRASH_H +struct kimage; + int crash_load_segments(struct kimage *image); int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params); void crash_smp_send_stop(void); +#ifdef CONFIG_KEXEC_CORE +void __init crash_reserve_low_1M(void); +#else +static inline void __init crash_reserve_low_1M(void) { } +#endif + #endif /* _ASM_X86_CRASH_H */ |