From 82e406d46733cd2cfd2e43ccfa12abb8a71576ce Mon Sep 17 00:00:00 2001
From: Nathan Lynch <nathanl@austin.ibm.com>
Date: Mon, 20 Mar 2006 18:35:15 -0600
Subject: [PATCH] --- yaml --- r: 22950 b: refs/heads/master c:
 2e5ce39d6703836b583c43131c365201a76285a5 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/powerpc/mm/numa.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c3c0e0ea82ee..a4a6d74d8bb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf4b85b0e4bab42b3e8d8b0acc6851bb85e2050b
+refs/heads/master: 2e5ce39d6703836b583c43131c365201a76285a5
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
index 2ae491d9404f..1fb11bbe1ace 100644
--- a/trunk/arch/powerpc/mm/numa.c
+++ b/trunk/arch/powerpc/mm/numa.c
@@ -129,7 +129,7 @@ void __init get_region(unsigned int nid, unsigned long *start_pfn,
 		*start_pfn = 0;
 }
 
-static inline void map_cpu_to_node(int cpu, int node)
+static void __cpuinit map_cpu_to_node(int cpu, int node)
 {
 	numa_cpu_lookup_table[cpu] = node;
 
@@ -155,7 +155,7 @@ static void unmap_cpu_from_node(unsigned long cpu)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static struct device_node *find_cpu_node(unsigned int cpu)
+static struct device_node * __cpuinit find_cpu_node(unsigned int cpu)
 {
 	unsigned int hw_cpuid = get_hard_smp_processor_id(cpu);
 	struct device_node *cpu_node = NULL;
@@ -284,7 +284,7 @@ static unsigned long __devinit read_n_cells(int n, unsigned int **buf)
  * Figure out to which domain a cpu belongs and stick it there.
  * Return the id of the domain used.
  */
-static int numa_setup_cpu(unsigned long lcpu)
+static int __cpuinit numa_setup_cpu(unsigned long lcpu)
 {
 	int numa_domain = 0;
 	struct device_node *cpu = find_cpu_node(lcpu);