adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix non-numa build
This commit is contained in:
Linus Torvalds 2007-10-17 15:13:42 -07:00
commit d85714d81c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/ia64/kernel/machine_kexec.c
View file

@ -17,6 +17,8 @@
#include <linux/efi.h> #include <linux/efi.h>
#include <linux/numa.h> #include <linux/numa.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <asm/numa.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/delay.h> #include <asm/delay.h>
@ -127,7 +129,7 @@ void machine_kexec(struct kimage *image)
void arch_crash_save_vmcoreinfo(void) 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_SYMBOL(pgdat_list);
VMCOREINFO_LENGTH(pgdat_list, MAX_NUMNODES); VMCOREINFO_LENGTH(pgdat_list, MAX_NUMNODES);