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>
This commit is contained in:
parent
0b966252d9
commit
082edb7bf4
|
@ -4,6 +4,7 @@
|
||||||
#include <linux/mmzone.h>
|
#include <linux/mmzone.h>
|
||||||
#include <linux/stddef.h>
|
#include <linux/stddef.h>
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
|
#include <linux/topology.h>
|
||||||
|
|
||||||
struct vm_area_struct;
|
struct vm_area_struct;
|
||||||
|
|
||||||
|
|
|
@ -764,12 +764,6 @@ extern int numa_zonelist_order_handler(struct ctl_table *, int,
|
||||||
extern char numa_zonelist_order[];
|
extern char numa_zonelist_order[];
|
||||||
#define NUMA_ZONELIST_ORDER_LEN 16 /* string buffer size */
|
#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
|
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
||||||
|
|
||||||
extern struct pglist_data contig_page_data;
|
extern struct pglist_data contig_page_data;
|
||||||
|
|
|
@ -196,4 +196,9 @@ int arch_update_cpu_topology(void);
|
||||||
#define topology_core_cpumask(cpu) cpumask_of(cpu)
|
#define topology_core_cpumask(cpu) cpumask_of(cpu)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Returns the number of the current Node. */
|
||||||
|
#ifndef numa_node_id
|
||||||
|
#define numa_node_id() (cpu_to_node(raw_smp_processor_id()))
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* _LINUX_TOPOLOGY_H */
|
#endif /* _LINUX_TOPOLOGY_H */
|
||||||
|
|
Loading…
Reference in a new issue