[src/trunk]: src/sys/arch/sun3 Fix merge botch. KERNBASE macro was split into...

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

details:   https://anonhg.NetBSD.org/src/rev/fe679b170a7d
branches:  trunk
changeset: 766063:fe679b170a7d
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Tue Jun 14 15:23:19 2011 +0000

description:
Fix merge botch. KERNBASE macro was split into KERNBASE3 and KERNBASE3X
for kernel, and was replaced with kernbase constant for possible reference
of USRSTACK in module(7).

diffstat:

 sys/arch/sun3/sun3/machdep.c  |  6 +++---
 sys/arch/sun3/sun3x/machdep.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r c085fc2b8e43 -r fe679b170a7d sys/arch/sun3/sun3/machdep.c
--- a/sys/arch/sun3/sun3/machdep.c      Tue Jun 14 15:08:33 2011 +0000
+++ b/sys/arch/sun3/sun3/machdep.c      Tue Jun 14 15:23:19 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.202 2011/06/12 03:35:48 rmind Exp $      */
+/*     $NetBSD: machdep.c,v 1.203 2011/06/14 15:23:19 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.202 2011/06/12 03:35:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.203 2011/06/14 15:23:19 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -720,7 +720,7 @@
 
        if (paddr >= avail_start) 
                return false;
-       *vaddr = KERNBASE + paddr;
+       *vaddr = KERNBASE3 + paddr;
        return true;
 }
 
diff -r c085fc2b8e43 -r fe679b170a7d sys/arch/sun3/sun3x/machdep.c
--- a/sys/arch/sun3/sun3x/machdep.c     Tue Jun 14 15:08:33 2011 +0000
+++ b/sys/arch/sun3/sun3x/machdep.c     Tue Jun 14 15:23:19 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.129 2011/06/12 03:35:48 rmind Exp $      */
+/*     $NetBSD: machdep.c,v 1.130 2011/06/14 15:23:19 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.129 2011/06/12 03:35:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 2011/06/14 15:23:19 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -681,7 +681,7 @@
 
        if (paddr >= avail_start) 
                return false;
-       *vaddr = KERNBASE + paddr;
+       *vaddr = KERNBASE3X + paddr;
        return true;
 }