Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Anton Blanchard
and committed by
Linus Torvalds
561fb765
6ade43fb
+4
-1
+4
-1
include/asm-ppc64/topology.h
+4
-1
include/asm-ppc64/topology.h
···
33
33
return first_cpu(tmp);
34
34
}
35
35
36
+
#define pcibus_to_node(node) (-1)
36
37
#define pcibus_to_cpumask(bus) (cpu_online_map)
37
38
38
39
#define nr_cpus_node(node) (nr_cpus_in_node[node])
···
60
59
.nr_balance_failed = 0, \
61
60
}
62
61
63
-
#endif /* CONFIG_NUMA */
62
+
#else
64
63
65
64
#include <asm-generic/topology.h>
65
+
66
+
#endif /* CONFIG_NUMA */
66
67
67
68
#endif /* _ASM_PPC64_TOPOLOGY_H */