diff options
| author |   Rusty Russell <rusty@rustcorp.com.au> | 2009-03-13 23:43:37 +1030 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-03-13 14:35:31 +0100 |
| commit | 082edb7bf443eb8eda15b482d16ad9dd8137ad24 (patch) | |
| tree | 167d8c2ca193af9161aded5f368f300981c59535 /include/linux/mmzone.h | |
| parent | cpumask: convert node_to_cpumask_map[] to cpumask_var_t (diff) | |
| download | linux-dev-082edb7bf443eb8eda15b482d16ad9dd8137ad24.tar.xz linux-dev-082edb7bf443eb8eda15b482d16ad9dd8137ad24.zip | |
numa, cpumask: move numa_node_id default implementation to topology.h
Impact: cleanup, potential bugfix
Not sure what changed to expose this, but clearly that numa_node_id()
doesn't belong in mmzone.h (the inline in gfp.h is probably overkill, too).
In file included from include/linux/topology.h:34,
from arch/x86/mm/numa.c:2:
/home/rusty/patches-cpumask/linux-2.6/arch/x86/include/asm/topology.h:64:1: warning: "numa_node_id" redefined
In file included from include/linux/topology.h:32,
from arch/x86/mm/numa.c:2:
include/linux/mmzone.h:770:1: warning: this is the location of the previous definition
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Mike Travis <travis@sgi.com>
LKML-Reference: <200903132343.37661.rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/mmzone.h')
| -rw-r--r-- | include/linux/mmzone.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 1aca6cebbb78..e6aacf77986a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -764,12 +764,6 @@ extern int numa_zonelist_order_handler(struct ctl_table *, int, extern char numa_zonelist_order[]; #define NUMA_ZONELIST_ORDER_LEN 16 /* string buffer size */ -#include <linux/topology.h> -/* Returns the number of the current Node. */ -#ifndef numa_node_id -#define numa_node_id() (cpu_to_node(raw_smp_processor_id())) -#endif - #ifndef CONFIG_NEED_MULTIPLE_NODES extern struct pglist_data contig_page_data; |