diff options
| author | peter <peter@FreeBSD.org> | 1997-04-26 11:46:25 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-04-26 11:46:25 +0000 |
| commit | 6323aa10bffe459912ba8b2f8592c7ac4ffd8705 (patch) | |
| tree | bf48960e09e26f0de373de093c89322724bbdd64 /sys/i386/include/clock.h | |
| parent | 96efe480c0c091aecb2f359675c74aca30f36a4a (diff) | |
| download | FreeBSD-src-6323aa10bffe459912ba8b2f8592c7ac4ffd8705.zip FreeBSD-src-6323aa10bffe459912ba8b2f8592c7ac4ffd8705.tar.gz | |
Man the liferafts! Here comes the long awaited SMP -> -current merge!
There are various options documented in i386/conf/LINT, there is more to
come over the next few days.
The kernel should run pretty much "as before" without the options to
activate SMP mode.
There are a handful of known "loose ends" that need to be fixed, but
have been put off since the SMP kernel is in a moderately good condition
at the moment.
This commit is the result of the tinkering and testing over the last 14
months by many people. A special thanks to Steve Passe for implementing
the APIC code!
Diffstat (limited to 'sys/i386/include/clock.h')
| -rw-r--r-- | sys/i386/include/clock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index 30ff97a..df8a20c 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -3,13 +3,13 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $Id$ + * $Id: clock.h,v 1.24 1997/02/22 09:33:59 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#if defined(I586_CPU) || defined(I686_CPU) +#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) #define CPU_CLOCKUPDATE(otime, ntime) cpu_clockupdate((otime), (ntime)) #else #define CPU_CLOCKUPDATE(otime, ntime) (*(otime) = *(ntime)) @@ -28,7 +28,7 @@ */ extern int adjkerntz; extern int disable_rtc_set; -#if defined(I586_CPU) || defined(I686_CPU) +#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) extern u_int i586_ctr_bias; extern u_int i586_ctr_comultiplier; extern u_int i586_ctr_freq; @@ -81,7 +81,7 @@ clock_latency(void) - ((high << 8) | low)); } -#if defined(I586_CPU) || defined(I686_CPU) +#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) /* * When we update `time', on i586's we also update `i586_ctr_bias' * atomically. `i586_ctr_bias' is the best available approximation to |
