diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-02 01:15:59 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-02 01:15:59 +0000 |
commit | 2030674d2b2c9a455de0eadcf13df85b393f56b6 (patch) | |
tree | 6bed2bfcd4f360848bc3413ebd83768dded62bc4 /sys/arch | |
parent | 84419f715cc0ae1676ac0f1479bd443857f6f4f4 (diff) |
I think there is no reason to splhigh around the VIA crypto stuff
anymore; also, indicate to userland that it may now safely use the
instructions
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/i386/i386/machdep.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index aa916ace64c..c697c3a1e03 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.272 2004/02/01 19:23:54 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.273 2004/02/02 01:15:58 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1141,9 +1141,7 @@ viac3_rnd(void *v) struct timeout *tmo = v; unsigned int *p, i, rv, creg0, len = VIAC3_RNG_BUFSIZ; static int buffer[VIAC3_RNG_BUFSIZ + 2]; - int s; - s = splhigh(); creg0 = rcr0(); /* Permit access to SIMD/FPU path */ lcr0(creg0 & ~(CR0_EM|CR0_TS)); @@ -1162,7 +1160,6 @@ viac3_rnd(void *v) add_true_randomness(*p); timeout_add(tmo, (hz>100)?(hz/100):1); - splx(s); } #ifdef CRYPTO @@ -1237,9 +1234,7 @@ viac3_crypto_setup(void) crypto_register(vc3_sc->sc_cid, algs, viac3_crypto_newsession, viac3_crypto_freesession, viac3_crypto_process); -#ifdef notdef i386_has_xcrypt = 1; -#endif } int @@ -1439,9 +1434,7 @@ viac3_crypto(void *cw, void *src, void *dst, void *key, int rep, void *iv, int type) { unsigned int creg0; - int s; - s = splhigh(); creg0 = rcr0(); /* Permit access to SIMD/FPU path */ lcr0(creg0 & ~(CR0_EM|CR0_TS)); @@ -1479,7 +1472,6 @@ viac3_crypto(void *cw, void *src, void *dst, void *key, int rep, } lcr0(creg0); - splx(s); } #endif /* CRYPTO */ |