summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2004-04-19 22:26:23 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2004-04-19 22:26:23 +0000
commit6871b1f00a11d40ab428ffe964737083a1a456e5 (patch)
treea5288c83fa0f20505015d2e60b023fab6b6e4cd5 /sys/arch/i386
parenta5e080fd53282cd59987c53cf571223043153190 (diff)
Report when VIA AES is present, even if we're not going to use it because
CRYPTO is not defined ok deraadt@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 7aee063693d..5ad884d0cff 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.289 2004/04/11 18:12:10 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.290 2004/04/19 22:26:22 tom Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -1177,9 +1177,9 @@ cyrix3_cpu_setup(cpu_device, model, step)
printf(" RNG");
}
-#ifdef CRYPTO
/* Enable AES engine if present and disabled */
if (val & 0x40) {
+#ifdef CRYPTO
extern int viac3_crypto_present;
if (!(val & 0x80)) {
@@ -1190,9 +1190,9 @@ cyrix3_cpu_setup(cpu_device, model, step)
wrmsr(0x1107, msreg);
}
viac3_crypto_present = 1;
+#endif /* CRYPTO */
printf(" AES");
}
-#endif /* CRYPTO */
printf("\n");
break;