d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't #ifdef out reference to i586_ctr_freq.

Browse Source
This commit is contained in:
Peter Wemm 1997-05-04 14:28:22 +00:00
parent 26e5316524
commit b455e1e981
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/i386/isa/random_machdep.c
View File

@ -1,7 +1,7 @@
/*
* random_machdep.c -- A strong random number generator
*
* $Id: random_machdep.c,v 1.15 1997/02/22 09:37:02 peter Exp $
* $Id: random_machdep.c,v 1.16 1997/04/26 11:46:03 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)) && !defined(SMP)
#if defined(I586_CPU) || defined(I686_CPU)
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)) && !defined(SMP)
#if defined(I586_CPU) || defined(I686_CPU)
}
#endif

6
sys/kern/kern_random.c
View File

@ -1,7 +1,7 @@
/*
* random_machdep.c -- A strong random number generator
*
* $Id: random_machdep.c,v 1.15 1997/02/22 09:37:02 peter Exp $
* $Id: random_machdep.c,v 1.16 1997/04/26 11:46:03 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)) && !defined(SMP)
#if defined(I586_CPU) || defined(I686_CPU)
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)) && !defined(SMP)
#if defined(I586_CPU) || defined(I686_CPU)
}
#endif