From 5d322ed7a34f2d504cbb4557ea7c74339bcbc43f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 21 Feb 2006 13:59:47 -0800
Subject: [PATCH] --- yaml --- r: 21511 b: refs/heads/master c:
 d371c0c17466b7e7bb4d395f96aa885a23df1073 h: refs/heads/master i:   21509:
 88eb8471918bd2caeb1d8a632ecc3531ddbed61c   21507:
 10198feea91d5b2d71875c2c26df649284aff0d0   21503:
 f10775e2cb34d2b69e366cd0dc016f6f54c462d8 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/sparc64/kernel/smp.c | 54 ---------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/[refs] b/[refs]
index 0b87797b2fbe..afa711b127b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c79f76777d678ba454aa727800e1386a1fd1f2e8
+refs/heads/master: d371c0c17466b7e7bb4d395f96aa885a23df1073
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
index b586345fe3b9..356d423ae14d 100644
--- a/trunk/arch/sparc64/kernel/smp.c
+++ b/trunk/arch/sparc64/kernel/smp.c
@@ -557,7 +557,6 @@ static void cheetah_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mas
 	}
 }
 
-#if 0
 /* Multi-cpu list version.  */
 static int init_cpu_list(u16 *list, cpumask_t mask)
 {
@@ -631,59 +630,6 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t
 
 	put_cpu();
 }
-#else
-/* Single-cpu list version.  */
-static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)
-{
-	int this_cpu = get_cpu();
-	struct trap_per_cpu *tb = &trap_block[this_cpu];
-	u64 *mondo = __va(tb->cpu_mondo_block_pa);
-	u16 *cpu_list = __va(tb->cpu_list_pa);
-	int i;
-
-	mondo[0] = data0;
-	mondo[1] = data1;
-	mondo[2] = data2;
-	wmb();
-
-	for_each_cpu_mask(i, mask) {
-		int retries = 0;
-
-		do {
-			register unsigned long func __asm__("%o5");
-			register unsigned long arg0 __asm__("%o0");
-			register unsigned long arg1 __asm__("%o1");
-			register unsigned long arg2 __asm__("%o2");
-
-			cpu_list[0] = i;
-			func = HV_FAST_CPU_MONDO_SEND;
-			arg0 = 1;
-			arg1 = tb->cpu_list_pa;
-			arg2 = tb->cpu_mondo_block_pa;
-
-			__asm__ __volatile__("ta	%8"
-					     : "=&r" (func), "=&r" (arg0),
-					       "=&r" (arg1), "=&r" (arg2)
-					     : "0" (func), "1" (arg0),
-					       "2" (arg1), "3" (arg2),
-					       "i" (HV_FAST_TRAP)
-					     : "memory");
-			if (likely(arg0 == HV_EOK))
-				break;
-
-			if (unlikely(++retries > 100)) {
-				printk("CPU[%d]: sun4v mondo error %lu\n",
-				       this_cpu, func);
-				break;
-			}
-
-			udelay(2 * i);
-		} while (1);
-	}
-
-	put_cpu();
-}
-#endif
 
 /* Send cross call to all processors mentioned in MASK
  * except self.