ChangeSet 1.2231.1.73, 2005/03/28 19:36:54-08:00, [EMAIL PROTECTED] [PATCH] x86_64: resume PIT for x86_64 resume PIT for x86_64 Signed-off-by: Luming Yu <[EMAIL PROTECTED]> Signed-off-by: Andi Kleen <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
i8259.c | 6 ++++++ time.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff -Nru a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c --- a/arch/x86_64/kernel/i8259.c 2005-03-28 21:22:34 -08:00 +++ b/arch/x86_64/kernel/i8259.c 2005-03-28 21:22:34 -08:00 @@ -477,6 +477,7 @@ void call_function_interrupt(void); void invalidate_interrupt(void); void thermal_interrupt(void); +void i8254_timer_resume(void); static void setup_timer(void) { @@ -491,6 +492,11 @@ { setup_timer(); return 0; +} + +void i8254_timer_resume(void) +{ + setup_timer(); } static struct sysdev_class timer_sysclass = { diff -Nru a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c --- a/arch/x86_64/kernel/time.c 2005-03-28 21:22:35 -08:00 +++ b/arch/x86_64/kernel/time.c 2005-03-28 21:22:35 -08:00 @@ -46,7 +46,7 @@ #ifdef CONFIG_CPU_FREQ static void cpufreq_delayed_get(void); #endif - +extern void i8254_timer_resume(void); extern int using_apic_timer; DEFINE_SPINLOCK(rtc_lock); @@ -980,6 +980,8 @@ if (vxtime.hpet_address) hpet_reenable(); + else + i8254_timer_resume(); sec = ctime + clock_cmos_diff; write_seqlock_irqsave(&xtime_lock,flags); - To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html