summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 15:13:42 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 15:13:42 -0700
commitd85714d81cc0408daddb68c10f7fd69eafe7c213 (patch)
tree99b14cd138681a777f0d8651c87d3ee758c6f98f
parent9d8190f87b5458160ba75d05e8ad6abefbe48a26 (diff)
parent7259888e84d5b6680c9d1f933654f4bdeed61700 (diff)
downloadop-kernel-dev-d85714d81cc0408daddb68c10f7fd69eafe7c213.zip
op-kernel-dev-d85714d81cc0408daddb68c10f7fd69eafe7c213.tar.gz
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
-rw-r--r--arch/ia64/kernel/machine_kexec.c4
1 files changed, 3 insertions, 1 deletions
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 machine_kexec(struct kimage *image)
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);
OpenPOWER on IntegriCloud