2.1.26 and CONFIG_APM

Joachim Schmitz (jojo@unixpc.dus.Tandem.COM)
Mon, 10 Feb 1997 17:27:24 +0100 (MET)

Hi hackers

linux-2.1.26/arch/i386/kernel/time.c doesn't compile, if CONFIG_APM is set.
Possible Fix (seems to work here):
--- linux-2.1.26/arch/i386/kernel/time.c~ Mon Feb 10 11:19:48 1997
+++ linux-2.1.26/arch/i386/kernel/time.c Mon Feb 10 11:19:56 1997
@@ -265,12 +265,14 @@
*tv = xtime;
tv->tv_usec += do_gettimeoffset();

+#ifndef CONFIG_APM
/*
* xtime is atomically updated in timer_bh. lost_ticks is
* nonzero if the timer bottom half hasnt executed yet.
*/
if (lost_ticks)
tv->tv_usec += USECS_PER_JIFFY;
+#endif

restore_flags(flags);

Bye, Jojo

email:
work SCHMITZ_JOACHIM@Tandem.COM
home Joachim_Schmitz@D.maus.de