diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 17:42:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 17:42:13 -0800 |
| commit | d2cb698f6896d4b3fc6794142a902d2647f7dbae (patch) | |
| tree | 8ee6cea13abc3e007da1c62f24d4d1de4551ee3f /arch/x86/kernel | |
| parent | 35a738fb5fd0fdd1cc7e749e3a45f1876ecd1db8 (diff) | |
| parent | f263245a0ce2c4e23b89a58fa5f7dfc048e11929 (diff) | |
| download | linux-d2cb698f6896d4b3fc6794142a902d2647f7dbae.tar.bz2 | |
Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kdump update from Ingo Molnar:
"Add the AMD SME mask to the vmcoreinfo, and also document our
vmcoreinfo fields"
* 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kdump: Document kernel data exported in the vmcoreinfo note
x86/kdump: Export the SME mask to vmcoreinfo
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/machine_kexec_64.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 4c8acdfdc5a7..ceba408ea982 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -352,6 +352,8 @@ void machine_kexec(struct kimage *image) void arch_crash_save_vmcoreinfo(void) { + u64 sme_mask = sme_me_mask; + VMCOREINFO_NUMBER(phys_base); VMCOREINFO_SYMBOL(init_top_pgt); vmcoreinfo_append_str("NUMBER(pgtable_l5_enabled)=%d\n", @@ -364,6 +366,7 @@ void arch_crash_save_vmcoreinfo(void) vmcoreinfo_append_str("KERNELOFFSET=%lx\n", kaslr_offset()); VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE); + VMCOREINFO_NUMBER(sme_mask); } /* arch-dependent functionality related to kexec file-based syscall */ |