---

yaml --- r: 119302 b: refs/heads/master c: 8c29890 h: refs/heads/master v: v3
git-mirror · Nov 30, 2008 · 14f3939 · 14f3939
1 parent 6a21bcd
commit 14f3939
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409832f5484cd1e2d8812c3236dffb33d01c359b
+refs/heads/master: 8c29890aef80702824e2284909ee301ef2430a3e
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
@@ -282,7 +282,7 @@ static unsigned long kimage_addr_to_ra(void *p)
 	return kern_base + (val - KERNBASE);
 }
 
-static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
+static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
 {
 	extern unsigned long sparc64_ttable_tl0;
 	extern unsigned long kern_locked_tte_data;
@@ -343,7 +343,7 @@ extern unsigned long sparc64_cpu_startup;
  */
 static struct thread_info *cpu_new_thread = NULL;
 
-static int __devinit smp_boot_one_cpu(unsigned int cpu)
+static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
 {
 	struct trap_per_cpu *tb = &trap_block[cpu];
 	unsigned long entry =

diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
@@ -956,7 +956,7 @@ int of_node_to_nid(struct device_node *dp)
 	return nid;
 }
 
-static void add_node_ranges(void)
+static void __init add_node_ranges(void)
 {
 	int i;
-Original file line number
+Diff line change
@@ Expand Up / @@ -956,7 +956,7 @@ int of_node_to_nid(struct device_node *dp) @@
     	return nid;
     }
-    static void add_node_ranges(void)
+    static void __init add_node_ranges(void)
     {
     	int i;
@@ Expand Down @@