Signed-off-by: Andrew Morton --- arch/x86_64/kernel/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/x86_64/kernel/time.c~x86_64-mm-pmtimer-dont-touch-pit arch/x86_64/kernel/time.c --- devel/arch/x86_64/kernel/time.c~x86_64-mm-pmtimer-dont-touch-pit 2006-02-27 20:57:36.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/time.c 2006-02-27 20:57:36.000000000 -0800 @@ -354,7 +354,7 @@ void main_timer_handler(struct pt_regs * { static unsigned long rtc_update = 0; unsigned long tsc; - int delay, offset = 0, lost = 0; + int delay = 0, offset = 0, lost = 0; /* * Here we are in the timer irq handler. We have irqs locally disabled (so we @@ -375,7 +375,7 @@ void main_timer_handler(struct pt_regs * */ offset = hpet_readl(HPET_T0_CMP) - hpet_tick; delay = hpet_readl(HPET_COUNTER) - offset; - } else { + } else if (!pmtmr_ioport) { spin_lock(&i8253_lock); outb_p(0x00, 0x43); delay = inb_p(0x40); _