From 14a2f46e6dde1926d232bf58b6b98b7136eaf722 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 21 Feb 2006 15:41:01 -0800
Subject: [PATCH] --- yaml --- r: 21513 b: refs/heads/master c:
 1bd0cd74d102a527b2a72907698d73fad4b82cbd h: refs/heads/master i:   21511:
 5d322ed7a34f2d504cbb4557ea7c74339bcbc43f v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sparc64/kernel/process.c | 10 ++--------
 trunk/arch/sparc64/kernel/smp.c     |  2 --
 trunk/include/asm-sparc64/cpudata.h |  2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5dc9d291e94c..d4b436e99821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ca2557c48000daa8183b07d83f582a597705ebe
+refs/heads/master: 1bd0cd74d102a527b2a72907698d73fad4b82cbd
diff --git a/trunk/arch/sparc64/kernel/process.c b/trunk/arch/sparc64/kernel/process.c
index d00cb7ad89b9..1ab8283efc4c 100644
--- a/trunk/arch/sparc64/kernel/process.c
+++ b/trunk/arch/sparc64/kernel/process.c
@@ -56,6 +56,8 @@ void default_idle(void)
 {
 }
 
+
+
 #ifndef CONFIG_SMP
 
 /*
@@ -104,19 +106,11 @@ void cpu_idle(void)
 
 	while(1) {
 		if (need_resched()) {
-			cpuinfo->idle_volume = 0;
 			preempt_enable_no_resched();
 			schedule();
 			preempt_disable();
 			check_pgt_cache();
 		}
-		cpuinfo->idle_volume++;
-
-		/* The store ordering is so that IRQ handlers on
-		 * other cpus see our increasing idleness for the buddy
-		 * redistribution algorithm.  -DaveM
-		 */
-		membar_storeload_storestore();
 	}
 }
 
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
index 356d423ae14d..0cd9b16612e7 100644
--- a/trunk/arch/sparc64/kernel/smp.c
+++ b/trunk/arch/sparc64/kernel/smp.c
@@ -88,8 +88,6 @@ void __init smp_store_cpu_info(int id)
 	cpu_data(id).clock_tick = prom_getintdefault(cpu_node,
 						     "clock-frequency", 0);
 
-	cpu_data(id).idle_volume		= 1;
-
 	def = ((tlb_type == hypervisor) ? (8 * 1024) : (16 * 1024));
 	cpu_data(id).dcache_size = prom_getintdefault(cpu_node, "dcache-size",
 						      def);
diff --git a/trunk/include/asm-sparc64/cpudata.h b/trunk/include/asm-sparc64/cpudata.h
index 84656f1895cd..c66a81bbc84d 100644
--- a/trunk/include/asm-sparc64/cpudata.h
+++ b/trunk/include/asm-sparc64/cpudata.h
@@ -19,7 +19,7 @@ typedef struct {
 	unsigned int	__softirq_pending; /* must be 1st, see rtrap.S */
 	unsigned int	multiplier;
 	unsigned int	counter;
-	unsigned int	idle_volume;
+	unsigned int	__pad1;
 	unsigned long	clock_tick;	/* %tick's per second */
 	unsigned long	udelay_val;