Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / machine_kexec.c

diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index c55a0909b9017ab5e5a4f43edcde5143a791b867..0823de1f6ebe2a44fb88dfa8baeac12f278bbfb0 100644 (file)
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -17,6 +17,8 @@
 #include <linux/efi.h>
 #include <linux/numa.h>
 #include <linux/mmzone.h>
+
+#include <asm/numa.h>
 #include <asm/mmu_context.h>
 #include <asm/setup.h>
 #include <asm/delay.h>
@@ -127,20 +129,21 @@ void machine_kexec(struct kimage *image)
 
 void arch_crash_save_vmcoreinfo(void)
 {
-#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
-       SYMBOL(pgdat_list);
-       LENGTH(pgdat_list, MAX_NUMNODES);
-
-       SYMBOL(node_memblk);
-       LENGTH(node_memblk, NR_NODE_MEMBLKS);
-       SIZE(node_memblk_s);
-       OFFSET(node_memblk_s, start_paddr);
-       OFFSET(node_memblk_s, size);
+#if defined(CONFIG_DISCONTIGMEM) || defined(CONFIG_SPARSEMEM)
+       VMCOREINFO_SYMBOL(pgdat_list);
+       VMCOREINFO_LENGTH(pgdat_list, MAX_NUMNODES);
+#endif
+#ifdef CONFIG_NUMA
+       VMCOREINFO_SYMBOL(node_memblk);
+       VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS);
+       VMCOREINFO_STRUCT_SIZE(node_memblk_s);
+       VMCOREINFO_OFFSET(node_memblk_s, start_paddr);
+       VMCOREINFO_OFFSET(node_memblk_s, size);
 #endif
 #ifdef CONFIG_PGTABLE_3
-       CONFIG(PGTABLE_3);
+       VMCOREINFO_CONFIG(PGTABLE_3);
 #elif  CONFIG_PGTABLE_4
-       CONFIG(PGTABLE_4);
+       VMCOREINFO_CONFIG(PGTABLE_4);
 #endif
 }