Re: topology api confusion

From: Anton Blanchard (
Date: 08/01/05

  • Next message: David S. Miller: "Re: git-net-fixup.patch added to -mm tree"
    Date:	Mon, 1 Aug 2005 15:07:48 +1000
    To: Nathan Lynch <>


    > We need some clarity on how asm-generic/topology.h is intended to be
    > used. I suspect that it's supposed to be unconditionally included at
    > the end of the architecture's topology.h so that any elements which
    > are undefined by the arch have sensible default definitions. Looking
    > at 2.6.13-rc3, this is what ppc64, ia64, and x86_64 currently do,
    > however i386 does not (i386 pulls in the generic version only when
    > !CONFIG_NUMA).
    > The #ifndef guards around each element of the topology api
    > cannot serve their apparent intended purpose when the architecture
    > implements a given bit as a function instead of a macro
    > (e.g. cpu_to_node in ppc64):

    Since it doesnt look like this will be resolved by 2.6.13 and NUMA is
    currently completely broken on ppc64, how does this patch look?

    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 <>
    Index: linux-2.6.git-work/include/asm-ppc64/topology.h
    --- linux-2.6.git-work.orig/include/asm-ppc64/topology.h	2005-07-30 23:49:56.000000000 +1000
    +++ linux-2.6.git-work/include/asm-ppc64/topology.h	2005-08-01 14:43:49.000000000 +1000
    @@ -33,6 +33,7 @@
     	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 @@
     	.nr_balance_failed	= 0,			\
    -#endif /* CONFIG_NUMA */
     #include <asm-generic/topology.h>
    +#endif /* CONFIG_NUMA */
     #endif /* _ASM_PPC64_TOPOLOGY_H */
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at

  • Next message: David S. Miller: "Re: git-net-fixup.patch added to -mm tree"