summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-03-09 23:30:30 +0000
committerjkim <jkim@FreeBSD.org>2012-03-09 23:30:30 +0000
commit56a05ae5138b6f5d7fc05fc2aed40e76b2d58213 (patch)
treed19183e15aa2a4bf7783f8802712d386473c2a98 /sys/boot
parent5ccebb7a339a9e55bec37c77492bb7dca3730508 (diff)
downloadFreeBSD-src-56a05ae5138b6f5d7fc05fc2aed40e76b2d58213.zip
FreeBSD-src-56a05ae5138b6f5d7fc05fc2aed40e76b2d58213.tar.gz
Make boot2 build with Clang again.
Submitted by: dim (bsd.sys.mk) Reviewed by: dim, jhb
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/boot2/boot2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 8291249..d5ac39e 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -129,8 +129,8 @@ static struct dsk {
int init;
} dsk;
static char cmd[512], cmddup[512], knamebuf[1024];
-static const char *kname;
-static uint32_t opts;
+static const char *kname = NULL;
+static uint32_t opts = 0;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@@ -225,8 +225,6 @@ main(void)
ino_t ino;
size_t nbyte;
- opts = 0;
- kname = NULL;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
v86.ctl = V86_FLAGS;
v86.efl = PSL_RESERVED_DEFAULT | PSL_I;
OpenPOWER on IntegriCloud