patch-2.1.102 linux/arch/i386/kernel/time.c

Next file: linux/arch/m68k/kernel/m68k_ksyms.c
Previous file: linux/arch/i386/kernel/smp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.101/linux/arch/i386/kernel/time.c linux/arch/i386/kernel/time.c
@@ -525,10 +525,6 @@
 	xtime.tv_usec = 0;
 
 	/* If we have the CPU hardware time counters, use them */
-#ifndef CONFIG_APM
-				/* Don't use them if a suspend/resume could
-                                   corrupt the timer value.  This problem
-                                   needs more debugging. */
 	if (boot_cpu_data.x86_capability & 16) {
 		do_gettimeoffset = do_fast_gettimeoffset;
 		do_get_fast_time = do_x86_get_fast_time;
@@ -551,6 +547,5 @@
 			 "=d" (init_timer_cc.high));
 		irq0.handler = pentium_timer_interrupt;
 	}
-#endif
 	setup_x86_irq(0, &irq0);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov