Re: 2.1.26 and CONFIG_APM

Ingo Molnar (mingo@pc5829.hil.siemens.at)
Tue, 11 Feb 1997 09:03:13 +0100 (MET)


On Mon, 10 Feb 1997, Joachim Schmitz wrote:

> 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):

the fix is slightly broken, rather use the patch i've posted recently.
(repeating it here:)

--- /pdl/linux/linux-2.1.26_orig/arch/i386/kernel/time.c Sat Feb 8 11:59:46 1997
+++ linux/arch/i386/kernel/time.c Sun Feb 9 20:09:27 1997
@@ -33,6 +33,10 @@
#include <linux/config.h>

extern int setup_x86_irq(int, struct irqaction *);
+extern volatile unsigned long lost_ticks;
+
+/* change this if you have some constant time drift */
+#define USECS_PER_JIFFY (1000020/HZ)

#ifndef CONFIG_APM /* cycle counter may be unreliable */
/* Cycle counter value at the previous timer interrupt.. */
@@ -40,11 +44,6 @@
unsigned long low;
unsigned long high;
} init_timer_cc, last_timer_cc;
-
-extern volatile unsigned long lost_ticks;
-
-/* change this if you have some constant time drift */
-#define USECS_PER_JIFFY (1000020/HZ)

static unsigned long do_fast_gettimeoffset(void)
{