From a20edb23e69c6246cdc884dfc173381fe2fb8457 Mon Sep 17 00:00:00 2001 From: Lee Schermerhorn Date: Mon, 14 Dec 2009 17:58:23 -0800 Subject: [PATCH] --- yaml --- r: 176245 b: refs/heads/master c: 4e25b2576efda24c02e2d6b9bcb5965a3f865f33 h: refs/heads/master i: 176243: 14dfa9fde9f9e72e9605574882fcb37bf91bc024 v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/numa.h | 2 -- trunk/arch/x86/include/asm/topology.h | 9 +++++++-- trunk/include/linux/numa.h | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a4117afa42e..d64ba76d8dde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06808b0827e1cd14eedc96bac2655d5b37ac246c +refs/heads/master: 4e25b2576efda24c02e2d6b9bcb5965a3f865f33 diff --git a/trunk/arch/ia64/include/asm/numa.h b/trunk/arch/ia64/include/asm/numa.h index 3499ff57bf42..6a8a27cfae3e 100644 --- a/trunk/arch/ia64/include/asm/numa.h +++ b/trunk/arch/ia64/include/asm/numa.h @@ -22,8 +22,6 @@ #include -#define NUMA_NO_NODE -1 - extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned; extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; extern pg_data_t *pgdat_list[MAX_NUMNODES]; diff --git a/trunk/arch/x86/include/asm/topology.h b/trunk/arch/x86/include/asm/topology.h index 40e37b10c6c0..c5087d796587 100644 --- a/trunk/arch/x86/include/asm/topology.h +++ b/trunk/arch/x86/include/asm/topology.h @@ -35,11 +35,16 @@ # endif #endif -/* Node not present */ -#define NUMA_NO_NODE (-1) +/* + * to preserve the visibility of NUMA_NO_NODE definition, + * moved to there from here. May be used independent of + * CONFIG_NUMA. + */ +#include #ifdef CONFIG_NUMA #include + #include #ifdef CONFIG_X86_32 diff --git a/trunk/include/linux/numa.h b/trunk/include/linux/numa.h index a31a7301b159..3aaa31603a86 100644 --- a/trunk/include/linux/numa.h +++ b/trunk/include/linux/numa.h @@ -10,4 +10,6 @@ #define MAX_NUMNODES (1 << NODES_SHIFT) +#define NUMA_NO_NODE (-1) + #endif /* _LINUX_NUMA_H */