summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/stand')
-rw-r--r--sys/arch/i386/stand/boot/conf.c4
-rw-r--r--sys/arch/i386/stand/boot/srt0.S3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index 45665de7c8d..ee1c88f35f7 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.48 2012/10/09 14:01:36 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.49 2012/10/12 15:00:33 jsing Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -43,7 +43,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "3.19";
+const char version[] = "3.20";
int debug = 1;
diff --git a/sys/arch/i386/stand/boot/srt0.S b/sys/arch/i386/stand/boot/srt0.S
index 81e3d7b4f7d..868b3264d1c 100644
--- a/sys/arch/i386/stand/boot/srt0.S
+++ b/sys/arch/i386/stand/boot/srt0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: srt0.S,v 1.15 2012/10/09 11:39:57 jsing Exp $ */
+/* $OpenBSD: srt0.S,v 1.16 2012/10/12 15:00:33 jsing Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -40,6 +40,7 @@
.globl Gdtr
.text
+ .align 16
.code16
.globl _start
_start: