summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64
diff options
context:
space:
mode:
authorChristoph Lameter <christoph@lameter.com>2005-06-23 00:08:17 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 09:45:08 -0700
commite164f5573bef0e6caf53519719cf0228c9c15ce3 (patch)
treebeb6820d42219d34fb83b008de774cebd5e7bac8 /include/asm-ppc64
parent4a35293667f8691b45fdb72770f087c086fb9702 (diff)
downloadop-kernel-dev-e164f5573bef0e6caf53519719cf0228c9c15ce3.zip
op-kernel-dev-e164f5573bef0e6caf53519719cf0228c9c15ce3.tar.gz
[PATCH] ppc64: pcibus_to_node fix
asm-generic/topology.h must also be included if CONFIG_NUMA is set in order to provide the fall back pcibus_to_node function. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r--include/asm-ppc64/topology.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-ppc64/topology.h b/include/asm-ppc64/topology.h
index d58d9dd..fcdcfd2 100644
--- a/include/asm-ppc64/topology.h
+++ b/include/asm-ppc64/topology.h
@@ -59,10 +59,8 @@ static inline int node_to_first_cpu(int node)
.nr_balance_failed = 0, \
}
-#else /* !CONFIG_NUMA */
+#endif /* CONFIG_NUMA */
#include <asm-generic/topology.h>
-#endif /* CONFIG_NUMA */
-
#endif /* _ASM_PPC64_TOPOLOGY_H */
OpenPOWER on IntegriCloud