diff options
| author | Andrew Morton <akpm@digeo.com> | 2002-09-29 02:20:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-29 02:20:47 -0700 |
| commit | 233da397f759f0584f63fdc644272c438f0b0268 (patch) | |
| tree | 9f6d37380dc656da923974e1c761188e491ccbc5 /include/asm-alpha | |
| parent | a1c9db9f3e8c7ad96e6b797b28915f98baee2b14 (diff) | |
[PATCH] topology API updates
From Matthew Dobson.
Leaves any functions which architectures haven't defined as undefined,
rather than using non-NUMA functions where users would expect
NUMA-functions.
This will cause compilation errors if someone tries to use an undefined
function, hopefully causing them to actually define those functions.
Also removes lingering topology-like macros that aren't being used, and
a couple typo fixes.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/topology.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h index 71263455e53b..f3c6cd7ae491 100644 --- a/include/asm-alpha/topology.h +++ b/include/asm-alpha/topology.h @@ -4,11 +4,17 @@ #ifdef CONFIG_NUMA #ifdef CONFIG_ALPHA_WILDFIRE /* With wildfire assume 4 CPUs per node */ -#define __cpu_to_node(cpu) ((cpu) >> 2) +#define __cpu_to_node(cpu) ((cpu) >> 2) #endif /* CONFIG_ALPHA_WILDFIRE */ #endif /* CONFIG_NUMA */ -/* Get the rest of the topology definitions */ -#include <asm-generic/topology.h> +#if !defined(CONFIG_NUMA) || !defined(CONFIG_ALPHA_WILDFIRE) +#define __cpu_to_node(cpu) (0) +#define __memblk_to_node(memblk) (0) +#define __parent_node(nid) (0) +#define __node_to_first_cpu(node) (0) +#define __node_to_cpu_mask(node) (cpu_online_map) +#define __node_to_memblk(node) (0) +#endif /* !CONFIG_NUMA || !CONFIG_ALPHA_WILDFIRE */ #endif /* _ASM_ALPHA_TOPOLOGY_H */ |