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
This commit is contained in:
commit
d85714d81c
1 changed files with 3 additions and 1 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue