---

yaml --- r: 107633 b: refs/heads/master c: deb1699 h: refs/heads/master i: 107631: 06b371d v: v3
git-mirror · Aug 4, 2008 · 6f71e46 · 6f71e46
1 parent f3e5233
commit 6f71e46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43f589235e223418d5807ebcddca73ec8a45f52c
+refs/heads/master: deb16999e452b74011dac5b2fe0d6258df81a2a1
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
@@ -759,7 +759,12 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, const cpum
 	printk("]\n");
 }
 
-static void (*xcall_deliver)(u64, u64, u64, const cpumask_t *);
+static void (*xcall_deliver_impl)(u64, u64, u64, const cpumask_t *);
+
+static void xcall_deliver(u64 data0, u64 data1, u64 data2, const cpumask_t *mask)
+{
+	xcall_deliver_impl(data0, data1, data2, mask);
+}
 
 /* Send cross call to all processors mentioned in MASK_P
  * except self.  Really, there are only two cases currently,
@@ -1182,11 +1187,11 @@ void __devinit smp_prepare_boot_cpu(void)
 void __init smp_setup_processor_id(void)
 {
 	if (tlb_type == spitfire)
-		xcall_deliver = spitfire_xcall_deliver;
+		xcall_deliver_impl = spitfire_xcall_deliver;
 	else if (tlb_type == cheetah || tlb_type == cheetah_plus)
-		xcall_deliver = cheetah_xcall_deliver;
+		xcall_deliver_impl = cheetah_xcall_deliver;
 	else
-		xcall_deliver = hypervisor_xcall_deliver;
+		xcall_deliver_impl = hypervisor_xcall_deliver;
 }
 
 void __devinit smp_fill_in_sib_core_maps(void)