* Ingo Molnar <mingo@xxxxxxx> wrote: > > Uni-processor build still fails with this patch (config is > > arch/ia64/configs/tiger_defconfig with CONFIG_SMP switched from =y > > to =n). > > could you try the full patchset that Travis has just sent and which > i've put into x86.git, you can pull it from: btw., i needed the fix below to get DISCONTIGMEM + !NUMA to build. (this is an ia64 build breakage independent of the x86.git merge) Ingo --------------> Subject: ia64: build fix From: Ingo Molnar <mingo@xxxxxxx> DISCONTIGMEM does not build with NUMA disabled: include/linux/gfp.h: In function `alloc_pages_node': include/linux/gfp.h:189: error: implicit declaration of function `NODE_DATA' include/linux/gfp.h:189: error: invalid type argument of `->' In file included from include/asm/uaccess.h:39, Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/ia64/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux-x86.q/arch/ia64/Kconfig =================================================================== --- linux-x86.q.orig/arch/ia64/Kconfig +++ linux-x86.q/arch/ia64/Kconfig @@ -351,7 +351,8 @@ config ARCH_SELECT_MEMORY_MODEL def_bool y config ARCH_DISCONTIGMEM_ENABLE - def_bool y + def_bool n + depends on NUMA help Say Y to support efficient handling of discontiguous physical memory, for architectures which are either NUMA (Non-Uniform Memory Access) @@ -372,7 +373,7 @@ config ARCH_DISCONTIGMEM_DEFAULT config NUMA bool "NUMA support" - depends on !IA64_HP_SIM && !FLATMEM + depends on !IA64_HP_SIM default y if IA64_SGI_SN2 select ACPI_NUMA if ACPI help - To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
