diff options
| author | Anton Blanchard <anton@samba.org> | 2005-08-01 21:11:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-01 21:38:01 -0700 |
| commit | 561fb765b97f287211a2c73a844c5edb12f44f1d (patch) | |
| tree | 87382d2ebd6ea6fabbb0449294e0da99f56223d2 | |
| parent | 6ade43fbbcc3c12f0ddba112351d14d6c82ae476 (diff) | |
| download | blackbird-op-linux-561fb765b97f287211a2c73a844c5edb12f44f1d.tar.gz blackbird-op-linux-561fb765b97f287211a2c73a844c5edb12f44f1d.zip | |
[PATCH] ppc64: topology API fix
Dont include asm-generic/topology.h unconditionally, we end up overriding
all the ppc64 specific functions when NUMA is on.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/asm-ppc64/topology.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ppc64/topology.h b/include/asm-ppc64/topology.h index fcdcfd26a26b..1e9b19073230 100644 --- a/include/asm-ppc64/topology.h +++ b/include/asm-ppc64/topology.h @@ -33,6 +33,7 @@ static inline int node_to_first_cpu(int node) return first_cpu(tmp); } +#define pcibus_to_node(node) (-1) #define pcibus_to_cpumask(bus) (cpu_online_map) #define nr_cpus_node(node) (nr_cpus_in_node[node]) @@ -59,8 +60,10 @@ static inline int node_to_first_cpu(int node) .nr_balance_failed = 0, \ } -#endif /* CONFIG_NUMA */ +#else #include <asm-generic/topology.h> +#endif /* CONFIG_NUMA */ + #endif /* _ASM_PPC64_TOPOLOGY_H */ |
