Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d85714d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9d8190f8 7259888e

arch/ia64/kernel/machine_kexec.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -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);