summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2012-10-09 13:57:42 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2012-10-09 13:57:42 +0000
commit3199cc7112c693b0ecdaf36fe6c4708d4d560d59 (patch)
tree78b7194a15fdcc5250b26f2be44c7fc04ed16b8b /sys/arch/amd64
parent02af0486e603b0f2ea7a465402af48202c633d1c (diff)
Ensure that softraid keys are cleared if rebooting from the boot loader.
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/stand/libsa/gidt.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/amd64/stand/libsa/gidt.S b/sys/arch/amd64/stand/libsa/gidt.S
index bef98ddf136..2d56d1fb1e2 100644
--- a/sys/arch/amd64/stand/libsa/gidt.S
+++ b/sys/arch/amd64/stand/libsa/gidt.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: gidt.S,v 1.9 2012/10/09 12:39:12 jsing Exp $ */
+/* $OpenBSD: gidt.S,v 1.10 2012/10/09 13:57:41 jsing Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -123,6 +123,9 @@
.globl _C_LABEL(_rtt)
ENTRY(_rtt)
+#ifdef BOOT_CRYPTO
+ call _C_LABEL(sr_clear_keys)
+#endif
#ifdef GIDT_DEBUG
movl $0xb8000, %ebx
movl $0x4f514f51, (%ebx)