Messages in this thread Patch in this message | | | Date | Fri, 15 May 1998 10:36:11 +0200 (CEST) | From | MOLNAR Ingo <> | Subject | Re: 2.1.102 and APM -- is the patch correct? |
| |
On Thu, 14 May 1998, Linus Torvalds wrote:
> which should take care of the problem wrt cyrix CPU's. I wanted to remove > the APM workaround to see whether people will complain.
those people will also need the attached patch to compile time.c with CONFIG_APM.
-- mingo
--- linux/arch/i386/kernel/time.c.orig Wed May 20 22:48:07 1998 +++ linux/arch/i386/kernel/time.c Wed May 20 22:48:40 1998 @@ -45,7 +45,6 @@ /* 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.. */ static struct { unsigned long low; @@ -133,7 +132,6 @@ return edx; } -#endif /* This function must be called with interrupts disabled * It was inspired by Steve McCanne's microtime-i386 for BSD. -- jrs @@ -248,7 +246,6 @@ return count; } -#ifndef CONFIG_APM /* * this is only used if we have fast gettimeoffset: */ @@ -256,7 +253,6 @@ { do_gettimeofday(tv); } -#endif static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset; @@ -429,7 +425,6 @@ #endif } -#ifndef CONFIG_APM /* cycle counter may be unreliable */ /* * This is the same as the above, except we _also_ save the current * cycle counter value at the time of the timer interrupt, so that @@ -443,7 +438,6 @@ "=d" (last_timer_cc.high)); timer_interrupt(irq, NULL, regs); } -#endif /* Converts Gregorian date to seconds since 1970-01-01 00:00:00. * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu
| |