diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:48:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:48:56 -0700 |
| commit | 12829dcb10efc576c3739131a5d57fe7213632d9 (patch) | |
| tree | 8b3084f7b3172820e6e87a219fe018f8e235ad38 /arch/ppc64/kernel/time.c | |
| parent | c60e81ee1cac32dae1f9bf623dcb6b3b2bde8eab (diff) | |
| parent | 719d1cd86780c156f954fc34f34481adac197aec (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/time.c')
| -rw-r--r-- | arch/ppc64/kernel/time.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 2a532db9138..909462e1ade 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 */ |