---

yaml --- r: 372110 b: refs/heads/master c: a7eb7c6 h: refs/heads/master v: v3
git-mirror · Apr 24, 2013 · eae86b9 · eae86b9
1 parent 546ac90
commit eae86b9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ff221bad8869f73141c6a3c187afe2e933c991f
+refs/heads/master: a7eb7c6f9a657a01a8359edae31bbeacd18b072c
diff --git a/trunk/arch/arm/common/mcpm_platsmp.c b/trunk/arch/arm/common/mcpm_platsmp.c
@@ -76,7 +76,7 @@ static void mcpm_cpu_die(unsigned int cpu)
 
 #endif
 
-struct smp_operations __initdata mcpm_smp_ops = {
+static struct smp_operations __initdata mcpm_smp_ops = {
 	.smp_init_cpus		= simple_smp_init_cpus,
 	.smp_boot_secondary	= mcpm_boot_secondary,
 	.smp_secondary_init	= mcpm_secondary_init,
@@ -85,3 +85,8 @@ struct smp_operations __initdata mcpm_smp_ops = {
 	.cpu_die		= mcpm_cpu_die,
 #endif
 };
+
+void __init mcpm_smp_set_ops(void)
+{
+	smp_set_ops(&mcpm_smp_ops);
+}
diff --git a/trunk/arch/arm/include/asm/mcpm.h b/trunk/arch/arm/include/asm/mcpm.h
@@ -167,6 +167,8 @@ int __mcpm_cluster_state(unsigned int cluster);
 int __init mcpm_sync_init(
 	void (*power_up_setup)(unsigned int affinity_level));
 
+void __init mcpm_smp_set_ops(void);
+
 #else
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,6 +167,8 @@ int __mcpm_cluster_state(unsigned int cluster); @@
     int __init mcpm_sync_init(
     	void (*power_up_setup)(unsigned int affinity_level));
+    void __init mcpm_smp_set_ops(void);
     #else
     /*
@@ Expand Down @@