diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 12:22:57 -0500 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 12:31:41 -0500 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /arch/x86/kernel/machine_kexec_64.c | |
| parent | 69e608411473ac56358ef35277563982d0565381 (diff) | |
| parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff) | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'arch/x86/kernel/machine_kexec_64.c')
| -rw-r--r-- | arch/x86/kernel/machine_kexec_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 4eabc160696f..679cef0791cd 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c | |||
| @@ -279,5 +279,7 @@ void arch_crash_save_vmcoreinfo(void) | |||
| 279 | VMCOREINFO_SYMBOL(node_data); | 279 | VMCOREINFO_SYMBOL(node_data); |
| 280 | VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); | 280 | VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); |
| 281 | #endif | 281 | #endif |
| 282 | vmcoreinfo_append_str("KERNELOFFSET=%lx\n", | ||
| 283 | (unsigned long)&_text - __START_KERNEL); | ||
| 282 | } | 284 | } |
| 283 | 285 | ||