Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cyrix.c | 2 +- arch/i386/kernel/time.c | 2 -- include/asm-i386/timer.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff -puN arch/i386/kernel/cpu/cyrix.c~x86_64-mm-pit_latch_buggy-has-no-effect arch/i386/kernel/cpu/cyrix.c --- a/arch/i386/kernel/cpu/cyrix.c~x86_64-mm-pit_latch_buggy-has-no-effect +++ a/arch/i386/kernel/cpu/cyrix.c @@ -279,7 +279,7 @@ static void __cpuinit init_cyrix(struct */ if (vendor == PCI_VENDOR_ID_CYRIX && (device == PCI_DEVICE_ID_CYRIX_5510 || device == PCI_DEVICE_ID_CYRIX_5520)) - pit_latch_buggy = 1; + mark_tsc_unstable(); } #endif c->x86_cache_size=16; /* Yep 16K integrated cache thats it */ diff -puN arch/i386/kernel/time.c~x86_64-mm-pit_latch_buggy-has-no-effect arch/i386/kernel/time.c --- a/arch/i386/kernel/time.c~x86_64-mm-pit_latch_buggy-has-no-effect +++ a/arch/i386/kernel/time.c @@ -70,8 +70,6 @@ #include -int pit_latch_buggy; /* extern */ - #include "do_timer.h" unsigned int cpu_khz; /* Detected as we calibrate the TSC */ diff -puN include/asm-i386/timer.h~x86_64-mm-pit_latch_buggy-has-no-effect include/asm-i386/timer.h --- a/include/asm-i386/timer.h~x86_64-mm-pit_latch_buggy-has-no-effect +++ a/include/asm-i386/timer.h @@ -9,8 +9,6 @@ void setup_pit_timer(void); unsigned long long native_sched_clock(void); unsigned long native_calculate_cpu_khz(void); -/* Modifiers for buggy PIT handling */ -extern int pit_latch_buggy; extern int timer_ack; extern int no_timer_check; extern int no_sync_cmos_clock; _