Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/kernel/machine_kexec_64.c between commit 4545c8988013 ("x86:
introduce kaslr_offset()") from the livepatching tree and commit
22543072a261 ("kdump, vmcoreinfo: report actual value of phys_base")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/x86/kernel/machine_kexec_64.c
index e1029633f664,ab48c252e661..000000000000
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@@ -335,7 -334,8 +335,8 @@@ void arch_crash_save_vmcoreinfo(void
VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
#endif
vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
- (unsigned long)&_text - __START_KERNEL);
+ kaslr_offset());
+ VMCOREINFO_PHYS_BASE(phys_base);
}
/* arch-dependent functionality related to kexec file-based syscall */
Attachment:
pgpzQ41vVfepg.pgp
Description: OpenPGP digital signature
