diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 09:48:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 09:48:19 -0800 |
| commit | 24ee25a6da84d83a25d93af52b5fef7407030b20 (patch) | |
| tree | 7ffb1f27b7d38134fa2723ef695b59a452a6a17c /arch/x86/realmode | |
| parent | 64d6a12094f35d644540c15440874723b1887f9d (diff) | |
| parent | 9eff303725da6530b615e9258f696149baa51df6 (diff) | |
| download | linux-24ee25a6da84d83a25d93af52b5fef7407030b20.tar.gz linux-24ee25a6da84d83a25d93af52b5fef7407030b20.tar.bz2 linux-24ee25a6da84d83a25d93af52b5fef7407030b20.zip | |
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/realmode')
| -rw-r--r-- | arch/x86/realmode/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index 7dce39c8c034..262f83cad355 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -8,6 +8,7 @@ #include <asm/pgtable.h> #include <asm/realmode.h> #include <asm/tlbflush.h> +#include <asm/crash.h> struct real_mode_header *real_mode_header; u32 *trampoline_cr4_features; @@ -34,6 +35,7 @@ void __init reserve_real_mode(void) memblock_reserve(mem, size); set_real_mode_mem(mem); + crash_reserve_low_1M(); } static void __init setup_real_mode(void) |