[src/sommerfeld_i386mp_1]: src/sys/arch/i386/i386 Merge up 1.216

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

details:   https://anonhg.NetBSD.org/src/rev/3621e3368797
branches:  sommerfeld_i386mp_1
changeset: 482202:3621e3368797
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Wed Feb 23 12:28:26 2000 +0000

description:
Merge up 1.216

diffstat:

 sys/arch/i386/i386/locore.s |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r 286b4d9cf6a3 -r 3621e3368797 sys/arch/i386/i386/locore.s
--- a/sys/arch/i386/i386/locore.s       Wed Feb 23 06:12:04 2000 +0000
+++ b/sys/arch/i386/i386/locore.s       Wed Feb 23 12:28:26 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.215.2.4 2000/02/23 06:12:04 sommerfeld Exp $      */
+/*     $NetBSD: locore.s,v 1.215.2.5 2000/02/23 12:28:26 sommerfeld Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -200,9 +200,8 @@
 #endif
 
 /* XXX temporary kluge; these should not be here */
-#define        IOM_BEGIN       0x0a0000        /* start of I/O memory "hole" */
-#define        IOM_END         0x100000        /* end of I/O memory "hole" */
-#define        IOM_SIZE        (IOM_END - IOM_BEGIN)
+/* Get definitions for IOM_BEGIN, IOM_END, and IOM_SIZE */
+#include <dev/isa/isareg.h>
 
 
 /* NB: NOP now preserves registers so NOPs can be inserted anywhere */