Skip to content

Commit

Permalink
x86: Remove redundant non-NUMA topology functions
Browse files Browse the repository at this point in the history
arch/x86/include/asm/topology.h declares inline fns cpu_to_node and
cpumask_of_node for !NUMA, even though they are then declared as
macros by asm-generic/topology.h, which is #included just below.

The macros (which are the same) end up being used; these functions
are just confusing.

Noticed-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: "Greg Kroah-Hartman" <gregkh@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
LKML-Reference: <200909241748.45629.rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Rusty Russell authored and Ingo Molnar committed Sep 24, 2009
1 parent 429a6e5 commit b0c6fbe
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions arch/x86/include/asm/topology.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,11 @@ static inline int numa_node_id(void)
return 0;
}

static inline int cpu_to_node(int cpu)
{
return 0;
}

static inline int early_cpu_to_node(int cpu)
{
return 0;
}

static inline const struct cpumask *cpumask_of_node(int node)
{
return cpu_online_mask;
}

static inline void setup_node_to_cpumask_map(void) { }

#endif
Expand Down

0 comments on commit b0c6fbe

Please sign in to comment.