The patch titled vmcoreinfo-fix-the-configuration-dependencies fix has been removed from the -mm tree. Its filename was vmcoreinfo-fix-the-configuration-dependencies-fix.patch This patch was dropped because it was folded into vmcoreinfo-fix-the-configuration-dependencies.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vmcoreinfo-fix-the-configuration-dependencies fix From: "Ken'ichi Ohmichi" <oomichi@xxxxxxxxxxxxxxxxx> Hi Andrew, Andrew Morton wrote: >> diff -rpuN a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c >> --- a/arch/x86/kernel/machine_kexec_64.c 2007-11-14 15:39:19.000000000 +0900 >> +++ b/arch/x86/kernel/machine_kexec_64.c 2007-11-14 15:39:33.000000000 +0900 >> @@ -235,7 +235,7 @@ void arch_crash_save_vmcoreinfo(void) >> { >> VMCOREINFO_SYMBOL(init_level4_pgt); >> >> -#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE >> +#ifdef CONFIG_NUMA >> VMCOREINFO_SYMBOL(node_data); >> VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); >> #endif >> _ >> > > x86_64-make-sparsemem-vmemmap-the-default-memory-model-v2.patch removes the > `VMCOREINFO_SYMBOL(node_data);' from arch/x86/kernel/machine_kexec_64.c > altogether, so I dropped that part of your patch. The above part is necessary for a NUMA kernel. Could you please merge the attached patch ? I guess that Christoph Lameter deleted the above part (which is added by the attached patch again) with the other part of discontigmem lines, because it depended on CONFIG_ARCH_DISCONTIGMEM_ENABLE. But the dependency was wrong, and it should depend on CONFIG_NUMA. The part is necessary for a NUMA kernel even if sparsemem. Signed-off-by: Ken'ichi Ohmichi <oomichi@xxxxxxxxxxxxxxxxx> Cc: Simon Horman <horms@xxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/machine_kexec_64.c | 5 +++++ 1 file changed, 5 insertions(+) diff -puN arch/x86/kernel/machine_kexec_64.c~vmcoreinfo-fix-the-configuration-dependencies-fix arch/x86/kernel/machine_kexec_64.c --- a/arch/x86/kernel/machine_kexec_64.c~vmcoreinfo-fix-the-configuration-dependencies-fix +++ a/arch/x86/kernel/machine_kexec_64.c @@ -234,5 +234,10 @@ NORET_TYPE void machine_kexec(struct kim void arch_crash_save_vmcoreinfo(void) { VMCOREINFO_SYMBOL(init_level4_pgt); + +#ifdef CONFIG_NUMA + VMCOREINFO_SYMBOL(node_data); + VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); +#endif } _ Patches currently in -mm which might be from oomichi@xxxxxxxxxxxxxxxxx are vmcoreinfo-rename-vmcoreinfos-macros-returning-the-size.patch vmcoreinfo-use-the-existing-offsetof-for-vmcoreinfo_offset.patch vmcoreinfo-add-vmcoreinfo_-to-all-the-call-for-vmcoreinfo_append_str.patch vmcoreinfo-fix-the-configuration-dependencies.patch vmcoreinfo-fix-the-configuration-dependencies-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html