commit d85714d81cc0408daddb68c10f7fd69eafe7c213
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Oct 17 15:13:42 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Oct 17 15:13:42 2007 -0700
tree 99b14cd138681a777f0d8651c87d3ee758c6f98f
parent 9d8190f87b5458160ba75d05e8ad6abefbe48a26
parent 7259888e84d5b6680c9d1f933654f4bdeed61700

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix non-numa build

arch/ia64/kernel/machine_kexec.c

diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 0dd3b23..d6cd45f 100644
--- 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,7 +129,7 @@
 
 void arch_crash_save_vmcoreinfo(void)
 {
-#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
+#if defined(CONFIG_ARCH_DISCONTIGMEM_ENABLE) && defined(CONFIG_NUMA)
 	VMCOREINFO_SYMBOL(pgdat_list);
 	VMCOREINFO_LENGTH(pgdat_list, MAX_NUMNODES);