From: Ian Campbell Date: Wed, 19 Dec 2012 14:16:19 +0000 (+0000) Subject: xen: arm: define node_online_map. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d3e6184717ef36444be005f78f09ff27bb617652;p=people%2Faperard%2Fxen-arm.git xen: arm: define node_online_map. For now just initialise it as a single online node, which is what asm-arm/numa.h assumes anyway. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S index 022338aeee..4abb30a49e 100644 --- a/xen/arch/arm/dummy.S +++ b/xen/arch/arm/dummy.S @@ -7,7 +7,6 @@ x: .word 0xe7f000f0 /* Undefined instruction */ x: mov pc, lr /* SMP support */ -DUMMY(node_online_map); DUMMY(smp_send_state_dump); /* PIRQ support */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 6555ac682a..351b559f48 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -38,6 +38,9 @@ EXPORT_SYMBOL(cpu_online_map); cpumask_t cpu_possible_map; EXPORT_SYMBOL(cpu_possible_map); +/* Fake one node for now. See also include/asm-arm/numa.h */ +nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; + /* Xen stack for bringing up the first CPU. */ static unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __attribute__((__aligned__(STACK_SIZE))); diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 1b060e6ae4..a1b1f584f8 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -1,7 +1,7 @@ #ifndef __ARCH_ARM_NUMA_H #define __ARCH_ARM_NUMA_H -/* Fake one node for now... */ +/* Fake one node for now. See also node_online_map. */ #define cpu_to_node(cpu) 0 #define node_to_cpumask(node) (cpu_online_map)