From 0dd3e789db5e8f9d640a2be4a55f336554851975 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 30 Jun 2005 15:15:53 +1000
Subject: [PATCH] --- yaml --- r: 4027 b: refs/heads/master c:
 74889802a1585af4e1652f0cb853ac22a65816a4 h: refs/heads/master i:   4025:
 396ca1488ac4af4b9b54829fb4f6b58d34627aaa   4023:
 218429626fdc960a4c443a279c0cebd8d18169c9 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/ppc64/kernel/ItLpQueue.c         | 9 ++-------
 trunk/arch/ppc64/kernel/irq.c               | 3 +--
 trunk/arch/ppc64/kernel/mf.c                | 3 +--
 trunk/arch/ppc64/kernel/time.c              | 3 +--
 trunk/include/asm-ppc64/iSeries/ItLpQueue.h | 2 +-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 259eeab362cf..1d8159e28943 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 937b31b114b5540f456ce1566aae67e02db41f2c
+refs/heads/master: 74889802a1585af4e1652f0cb853ac22a65816a4
diff --git a/trunk/arch/ppc64/kernel/ItLpQueue.c b/trunk/arch/ppc64/kernel/ItLpQueue.c
index a81e49b91af0..a849f6775ad6 100644
--- a/trunk/arch/ppc64/kernel/ItLpQueue.c
+++ b/trunk/arch/ppc64/kernel/ItLpQueue.c
@@ -127,14 +127,14 @@ static void hvlpevent_clear_valid( struct HvLpEvent * event )
 	event->xFlags.xValid = 0;
 }
 
-unsigned process_hvlpevents(struct pt_regs *regs)
+void process_hvlpevents(struct pt_regs *regs)
 {
 	unsigned numIntsProcessed = 0;
 	struct HvLpEvent * nextLpEvent;
 
 	/* If we have recursed, just return */
 	if ( !set_inUse() )
-		return 0;
+		return;
 	
 	if (ItLpQueueInProcess == 0)
 		ItLpQueueInProcess = 1;
@@ -144,9 +144,6 @@ unsigned process_hvlpevents(struct pt_regs *regs)
 	for (;;) {
 		nextLpEvent = get_next_hvlpevent();
 		if ( nextLpEvent ) {
-			/* Count events to return to caller
-			 * and count processed events in hvlpevent_queue
- 			 */
 			++numIntsProcessed;
 			hvlpevent_queue.xLpIntCount++;
 			/* Call appropriate handler here, passing 
@@ -186,8 +183,6 @@ unsigned process_hvlpevents(struct pt_regs *regs)
 	clear_inUse();
 
 	get_paca()->lpevent_count += numIntsProcessed;
-
-	return numIntsProcessed;
 }
 
 static int set_spread_lpevents(char *str)
diff --git a/trunk/arch/ppc64/kernel/irq.c b/trunk/arch/ppc64/kernel/irq.c
index bd4b035af622..e79420bb72a5 100644
--- a/trunk/arch/ppc64/kernel/irq.c
+++ b/trunk/arch/ppc64/kernel/irq.c
@@ -66,7 +66,6 @@ EXPORT_SYMBOL(irq_desc);
 int distribute_irqs = 1;
 int __irq_offset_value;
 int ppc_spurious_interrupts;
-unsigned long lpevent_count;
 u64 ppc64_interrupt_controller;
 
 int show_interrupts(struct seq_file *p, void *v)
@@ -295,7 +294,7 @@ void do_IRQ(struct pt_regs *regs)
 	}
 #endif /* CONFIG_SMP */
 	if (hvlpevent_is_pending())
-		lpevent_count += process_hvlpevents(regs);
+		process_hvlpevents(regs);
 
 	irq_exit();
 
diff --git a/trunk/arch/ppc64/kernel/mf.c b/trunk/arch/ppc64/kernel/mf.c
index 609bf1bda7b8..ef4a338ebd01 100644
--- a/trunk/arch/ppc64/kernel/mf.c
+++ b/trunk/arch/ppc64/kernel/mf.c
@@ -801,9 +801,8 @@ int mf_get_boot_rtc(struct rtc_time *tm)
 		return rc;
 	/* We need to poll here as we are not yet taking interrupts */
 	while (rtc_data.busy) {
-		extern unsigned long lpevent_count;
 		if (hvlpevent_is_pending())
-			lpevent_count += process_hvlpevents(NULL);
+			process_hvlpevents(NULL);
 	}
 	return rtc_set_tm(rtc_data.rc, rtc_data.ce_msg.ce_msg, tm);
 }
diff --git a/trunk/arch/ppc64/kernel/time.c b/trunk/arch/ppc64/kernel/time.c
index f9c18400ebf5..909462e1adea 100644
--- a/trunk/arch/ppc64/kernel/time.c
+++ b/trunk/arch/ppc64/kernel/time.c
@@ -99,7 +99,6 @@ unsigned long tb_to_ns_shift;
 struct gettimeofday_struct do_gtod;
 
 extern unsigned long wall_jiffies;
-extern unsigned long lpevent_count;
 extern int smp_tb_synchronized;
 
 extern struct timezone sys_tz;
@@ -368,7 +367,7 @@ int timer_interrupt(struct pt_regs * regs)
 
 #ifdef CONFIG_PPC_ISERIES
 	if (hvlpevent_is_pending())
-		lpevent_count += process_hvlpevents(regs);
+		process_hvlpevents(regs);
 #endif
 
 /* collect purr register values often, for accurate calculations */
diff --git a/trunk/include/asm-ppc64/iSeries/ItLpQueue.h b/trunk/include/asm-ppc64/iSeries/ItLpQueue.h
index f0f24a39ff6d..6ba74c0d910b 100644
--- a/trunk/include/asm-ppc64/iSeries/ItLpQueue.h
+++ b/trunk/include/asm-ppc64/iSeries/ItLpQueue.h
@@ -77,7 +77,7 @@ struct hvlpevent_queue {
 extern struct hvlpevent_queue hvlpevent_queue;
 
 extern int hvlpevent_is_pending(void);
-extern unsigned process_hvlpevents(struct pt_regs *);
+extern void process_hvlpevents(struct pt_regs *);
 extern void setup_hvlpevent_queue(void);
 
 #endif /* _ITLPQUEUE_H */