Skip to content

Commit

Permalink
x86: fix build warning when CONFIG_NUMA not defined.
Browse files Browse the repository at this point in the history
Impact: fix build warning

The macro cpu_to_node did not reference it's argument, and instead
simply returned a 0.  This causes a "unused variable" warning if
it's the only reference in a function (show_cache_disable).

Replace it with the more correct inline function.

Signed-off-by: Mike Travis <travis@sgi.com>
  • Loading branch information
Mike Travis committed Jan 15, 2009
1 parent e46d517 commit f2a0827
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions arch/x86/include/asm/topology.h
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,20 @@ extern int __node_distance(int, int);

#else /* !CONFIG_NUMA */

#define numa_node_id() 0
#define cpu_to_node(cpu) 0
#define early_cpu_to_node(cpu) 0
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 cpumask_t *cpumask_of_node(int node)
{
Expand Down

0 comments on commit f2a0827

Please sign in to comment.