summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/stand/biosboot/biosboot.S4
-rw-r--r--sys/arch/amd64/stand/mbr/mbr.S6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/stand/biosboot/biosboot.S b/sys/arch/amd64/stand/biosboot/biosboot.S
index a5d31bb4217..7143aec41df 100644
--- a/sys/arch/amd64/stand/biosboot/biosboot.S
+++ b/sys/arch/amd64/stand/biosboot/biosboot.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosboot.S,v 1.1 2004/02/03 12:09:47 mickey Exp $ */
+/* $OpenBSD: biosboot.S,v 1.2 2004/03/21 21:22:10 tom Exp $ */
/*
* Copyright (c) 2003 Tobias Weingartner
@@ -572,7 +572,7 @@ err_print2:
err_stop:
call Lmessage
stay_stopped:
- cli
+ sti /* Ensure Ctl-Alt-Del will work */
hlt
jmp stay_stopped /* Just to make sure :-) */
diff --git a/sys/arch/amd64/stand/mbr/mbr.S b/sys/arch/amd64/stand/mbr/mbr.S
index b7553ead71a..384fab97ec4 100644
--- a/sys/arch/amd64/stand/mbr/mbr.S
+++ b/sys/arch/amd64/stand/mbr/mbr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.S,v 1.1 2004/02/03 12:09:47 mickey Exp $ */
+/* $OpenBSD: mbr.S,v 1.2 2004/03/21 21:22:10 tom Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff and Tobias Weingartner
@@ -57,7 +57,7 @@
*
* We use a long jmp to normalise our address to seg:offset 07A0:0000
* We set the stack to start at 07C0:FFFC (grows down on i386)
- * We load the partition boot record (PBR) /boot at seg:offset 4000:0000
+ * The partition boot record (PBR) loads /boot at seg:offset 4000:0000
*/
#define BOOTSEG 0x7c0 /* segment where we are loaded */
#define BOOTRELOCSEG 0x7a0 /* segment where we relocate to */
@@ -248,7 +248,7 @@ err_stop:
call Lmessage
stay_stopped:
- cli
+ sti /* Ensure Ctl-Alt-Del will work */
hlt
/* Just to make sure */
jmp stay_stopped