From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2019 17:48:19 +0000 (-0800)
Subject: Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=24ee25a6da84d83a25d93af52b5fef7407030b20;p=linux.git

Merge branch 'x86-kdump-for-linus' of git://git./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
---

24ee25a6da84d83a25d93af52b5fef7407030b20
diff --cc arch/x86/include/asm/crash.h
index 089b2850f9d1a,88eadd08ad708..f58de66091e5e
--- a/arch/x86/include/asm/crash.h
+++ b/arch/x86/include/asm/crash.h
@@@ -2,7 -2,10 +2,9 @@@
  #ifndef _ASM_X86_CRASH_H
  #define _ASM_X86_CRASH_H
  
+ struct kimage;
+ 
  int crash_load_segments(struct kimage *image);
 -int crash_copy_backup_region(struct kimage *image);
  int crash_setup_memmap_entries(struct kimage *image,
  		struct boot_params *params);
  void crash_smp_send_stop(void);