numa, cpumask: move numa_node_id default implementation to topology.h (082edb7b) · Commits · 戴 / test

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>

include/linux/gfp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		#include <linux/mmzone.h>
		#include <linux/stddef.h>
		#include <linux/linkage.h>
		#include <linux/topology.h>

		struct vm_area_struct;

include/linux/mmzone.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;

include/linux/topology.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -196,4 +196,9 @@ int arch_update_cpu_topology(void);
		#define topology_core_cpumask(cpu) cpumask_of(cpu)
		#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 */

Admin message