[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>
This commit is contained in:
Anton Blanchard 2005-08-01 21:11:46 -07:00 коммит произвёл Linus Torvalds
Родитель 6ade43fbbc
Коммит 561fb765b9
1 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

@ -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 */