diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 13:52:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 13:52:00 -0400 |
| commit | ba00003aa83a61b615542dd66f5af8fb4a7cee1d (patch) | |
| tree | 013dde7e89730e54433aa40b5e9d67997931aed6 /arch/powerpc/kernel/time.c | |
| parent | 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 (diff) | |
| parent | 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] PReP fixup after irq changes
[POWERPC] SPU fixup after irq changes
[POWERPC] Fix up after irq changes
[POWERPC] Fix iseries/smp.c for irq breakage
[POWERPC] Fix viocons for irq breakage
[POWERPC] Update iseries_defconfig
[POWERPC] Fix fsl_soc build breaks
[POWERPC] Minor fix for bootargs property
[POWERPC] Update MTFSF_L() comment
[POWERPC] Update pSeries defconfig for SATA
[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ
[POWERPC] Fix zImage decompress location
[POWERPC] linux,tce-size property is 32 bits
[POWERPC] Add DTS for MPC8349E-mITX board
[POWERPC] Fix harmless typo
[PPC] Fix some irq breakage with ARCH=ppc
Diffstat (limited to 'arch/powerpc/kernel/time.c')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index d210d0a5006b..5b59bc18dfe7 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
| @@ -706,7 +706,7 @@ void timer_interrupt(struct pt_regs * regs) | |||
| 706 | 706 | ||
| 707 | #ifdef CONFIG_PPC_ISERIES | 707 | #ifdef CONFIG_PPC_ISERIES |
| 708 | if (hvlpevent_is_pending()) | 708 | if (hvlpevent_is_pending()) |
| 709 | process_hvlpevents(regs); | 709 | process_hvlpevents(); |
| 710 | #endif | 710 | #endif |
| 711 | 711 | ||
| 712 | #ifdef CONFIG_PPC64 | 712 | #ifdef CONFIG_PPC64 |