From 860b7b14280e24217fa333031ba4709fceb8f787 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 13 Mar 2009 23:43:37 +1030 Subject: [PATCH] --- yaml --- r: 140560 b: refs/heads/master c: 082edb7bf443eb8eda15b482d16ad9dd8137ad24 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/gfp.h | 1 + trunk/include/linux/mmzone.h | 6 ------ trunk/include/linux/topology.h | 5 +++++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 976a2463aacb..a5efa3cf1b17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b966252d9e5d95ec2d11e63d7e55b42913aa5b7 +refs/heads/master: 082edb7bf443eb8eda15b482d16ad9dd8137ad24 diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h index dd20cd78faa8..0bbc15f54536 100644 --- a/trunk/include/linux/gfp.h +++ b/trunk/include/linux/gfp.h @@ -4,6 +4,7 @@ #include #include #include +#include struct vm_area_struct; diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 1aca6cebbb78..e6aacf77986a 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/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 -/* 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; diff --git a/trunk/include/linux/topology.h b/trunk/include/linux/topology.h index 16b7d6896ce9..7402c1a27c4f 100644 --- a/trunk/include/linux/topology.h +++ b/trunk/include/linux/topology.h @@ -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 */