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/kern/kern_random.c | |
| 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/kern/kern_random.c')
| -rw-r--r-- | sys/kern/kern_random.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c index 64c215c..5fb9ef8 100644 --- a/sys/kern/kern_random.c +++ b/sys/kern/kern_random.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id$ + * $Id: random_machdep.c,v 1.15 1997/02/22 09:37:02 peter Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -192,7 +192,7 @@ add_timer_randomness(struct random_bucket *r, struct timer_rand_state *state, u_int nbits; u_int32_t time; -#if defined(I586_CPU) || defined(I686_CPU) +#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) if (i586_ctr_freq != 0) { num ^= (u_int32_t) rdtsc() << 16; r->entropy_count += 2; @@ -204,7 +204,7 @@ add_timer_randomness(struct random_bucket *r, struct timer_rand_state *state, num ^= inb(TIMER_CNTR0) << 24; enable_intr(); r->entropy_count += 2; -#if defined(I586_CPU) || defined(I686_CPU) +#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) } #endif |
