Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 2a532db9138a..909462e1adea 100644
--- a/arch/ppc64/kernel/time.c
+++ b/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;
@@ -367,11 +366,8 @@ int timer_interrupt(struct pt_regs * regs)
         set_dec(next_dec);
 
 #ifdef CONFIG_PPC_ISERIES
-        {
-                struct ItLpQueue *lpq = lpaca->lpqueue_ptr;
-                if (lpq && ItLpQueue_isLpIntPending(lpq))
-                        lpevent_count += ItLpQueue_process(lpq, regs);
-        }
+        if (hvlpevent_is_pending())
+                process_hvlpevents(regs);
 #endif
 
 /* collect purr register values often, for accurate calculations */