[PATCH 10/15] ppc64: Rename ItLpQueue_* functions to hvlpevent_queue_*

Michael Ellerman michael at ellerman.id.au
Tue Jun 28 09:17:55 EST 2005


Hi,

Now that we've renamed the xItLpQueue structure, rename the functions that
operate on it also.


Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
--

Index: work/arch/ppc64/kernel/ItLpQueue.c
===================================================================
--- work.orig/arch/ppc64/kernel/ItLpQueue.c
+++ work/arch/ppc64/kernel/ItLpQueue.c
@@ -70,7 +70,7 @@ static __inline__ void clear_inUse(void)
 extern LpEventHandler lpEventHandler[HvLpEvent_Type_NumTypes];
 unsigned long ItLpQueueInProcess = 0;
 
-static struct HvLpEvent * ItLpQueue_getNextLpEvent(void)
+static struct HvLpEvent * hvlpevent_queue_next_event(void)
 {
 	struct HvLpEvent * nextLpEvent = 
 		(struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;
@@ -94,7 +94,7 @@ static struct HvLpEvent * ItLpQueue_getN
 
 unsigned long spread_lpevents = NR_CPUS;
 
-int ItLpQueue_isLpIntPending(void)
+int hvlpevent_queue_event_pending(void)
 {
 	struct HvLpEvent *next_event;
 
@@ -105,7 +105,7 @@ int ItLpQueue_isLpIntPending(void)
 	return next_event->xFlags.xValid | hvlpevent_queue.xPlicOverflowIntPending;
 }
 
-static void ItLpQueue_clearValid( struct HvLpEvent * event )
+static void hvlpevent_clear_valid( struct HvLpEvent * event )
 {
 	/* Clear the valid bit of the event
 	 * Also clear bits within this event that might
@@ -127,7 +127,7 @@ static void ItLpQueue_clearValid( struct
 	event->xFlags.xValid = 0;
 }
 
-unsigned ItLpQueue_process(struct pt_regs *regs)
+unsigned hvlpevent_queue_process(struct pt_regs *regs)
 {
 	unsigned numIntsProcessed = 0;
 	struct HvLpEvent * nextLpEvent;
@@ -142,7 +142,7 @@ unsigned ItLpQueue_process(struct pt_reg
 		BUG();
 
 	for (;;) {
-		nextLpEvent = ItLpQueue_getNextLpEvent();
+		nextLpEvent = hvlpevent_queue_next_event();
 		if ( nextLpEvent ) {
 			/* Count events to return to caller
 			 * and count processed events in hvlpevent_queue
@@ -170,7 +170,7 @@ unsigned ItLpQueue_process(struct pt_reg
 			else
 				printk(KERN_INFO "Unexpected Lp Event type=%d\n", nextLpEvent->xType );
 			
-			ItLpQueue_clearValid( nextLpEvent );
+			hvlpevent_clear_valid( nextLpEvent );
 		} else if ( hvlpevent_queue.xPlicOverflowIntPending )
 			/*
 			 * No more valid events. If overflow events are
Index: work/arch/ppc64/kernel/idle.c
===================================================================
--- work.orig/arch/ppc64/kernel/idle.c
+++ work/arch/ppc64/kernel/idle.c
@@ -88,7 +88,7 @@ static int iSeries_idle(void)
 
 	while (1) {
 		if (lpaca->lppaca.shared_proc) {
-			if (ItLpQueue_isLpIntPending())
+			if (hvlpevent_queue_event_pending())
 				process_iSeries_events();
 			if (!need_resched())
 				yield_shared_processor();
@@ -100,7 +100,7 @@ static int iSeries_idle(void)
 
 				while (!need_resched()) {
 					HMT_medium();
-					if (ItLpQueue_isLpIntPending())
+					if (hvlpevent_queue_event_pending())
 						process_iSeries_events();
 					HMT_low();
 				}
Index: work/arch/ppc64/kernel/irq.c
===================================================================
--- work.orig/arch/ppc64/kernel/irq.c
+++ work/arch/ppc64/kernel/irq.c
@@ -294,8 +294,8 @@ void do_IRQ(struct pt_regs *regs)
 		iSeries_smp_message_recv(regs);
 	}
 #endif /* CONFIG_SMP */
-	if (ItLpQueue_isLpIntPending())
-		lpevent_count += ItLpQueue_process(regs);
+	if (hvlpevent_queue_event_pending())
+		lpevent_count += hvlpevent_queue_process(regs);
 
 	irq_exit();
 
Index: work/arch/ppc64/kernel/mf.c
===================================================================
--- work.orig/arch/ppc64/kernel/mf.c
+++ work/arch/ppc64/kernel/mf.c
@@ -802,8 +802,8 @@ int mf_get_boot_rtc(struct rtc_time *tm)
 	/* We need to poll here as we are not yet taking interrupts */
 	while (rtc_data.busy) {
 		extern unsigned long lpevent_count;
-		if (ItLpQueue_isLpIntPending())
-			lpevent_count += ItLpQueue_process(NULL);
+		if (hvlpevent_queue_event_pending())
+			lpevent_count += hvlpevent_queue_process(NULL);
 	}
 	return rtc_set_tm(rtc_data.rc, rtc_data.ce_msg.ce_msg, tm);
 }
Index: work/arch/ppc64/kernel/time.c
===================================================================
--- work.orig/arch/ppc64/kernel/time.c
+++ work/arch/ppc64/kernel/time.c
@@ -367,8 +367,8 @@ int timer_interrupt(struct pt_regs * reg
 
 #ifdef CONFIG_PPC_ISERIES
 	{
-		if (ItLpQueue_isLpIntPending())
-			lpevent_count += ItLpQueue_process(regs);
+		if (hvlpevent_queue_event_pending())
+			lpevent_count += hvlpevent_queue_process(regs);
 	}
 #endif
 
Index: work/include/asm-ppc64/iSeries/ItLpQueue.h
===================================================================
--- work.orig/include/asm-ppc64/iSeries/ItLpQueue.h
+++ work/include/asm-ppc64/iSeries/ItLpQueue.h
@@ -75,8 +75,8 @@ struct hvlpevent_queue {
 };
 
 
-extern int ItLpQueue_isLpIntPending(void);
-extern unsigned ItLpQueue_process(struct pt_regs *);
+extern int hvlpevent_queue_event_pending(void);
+extern unsigned hvlpevent_queue_process(struct pt_regs *);
 extern void hvlpevent_queue_setup(void);
 
 #endif /* _ITLPQUEUE_H */



More information about the Linuxppc64-dev mailing list