[src/trunk]: src/sys/arch/i386/i386 The previous change was wrong. The varia...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9e0811f5bb6
branches:  trunk
changeset: 554493:d9e0811f5bb6
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Tue Oct 28 23:10:02 2003 +0000

description:
The previous change was wrong.  The variables were legitimately uninitialized.
This code was broken on 2002/10/22 by christos.

diffstat:

 sys/arch/i386/i386/vm86.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r e0c456e2dd72 -r d9e0811f5bb6 sys/arch/i386/i386/vm86.c
--- a/sys/arch/i386/i386/vm86.c Tue Oct 28 23:04:26 2003 +0000
+++ b/sys/arch/i386/i386/vm86.c Tue Oct 28 23:10:02 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm86.c,v 1.36 2003/10/27 14:11:47 junyoung Exp $       */
+/*     $NetBSD: vm86.c,v 1.37 2003/10/28 23:10:02 mycroft Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm86.c,v 1.36 2003/10/27 14:11:47 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm86.c,v 1.37 2003/10/28 23:10:02 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,15 +96,15 @@
 
 #define getword(base, ptr, word) \
        do { \
-               u_long w1 = 0, w2 = 0; /* XXX: gcc */\
-               getbyte(base, ptr, w1); \
-               getbyte(base, ptr, w2); \
-               word = w1 | w2 << 8; \
+               u_long b1, b2; \
+               getbyte(base, ptr, b1); \
+               getbyte(base, ptr, b2); \
+               word = b1 | b2 << 8; \
        } while (0)
 
 #define getdword(base, ptr, dword) \
        do { \
-               u_long w1 = 0, w2 = 0; /* XXX: gcc */\
+               u_long w1, w2; \
                getword(base, ptr, w1); \
                getword(base, ptr, w2); \
                dword = w1 | w2 << 16; \