Module Name: src
Committed By: tsutsui
Date: Tue Jun 14 15:23:19 UTC 2011
Modified Files:
src/sys/arch/sun3/sun3: machdep.c
src/sys/arch/sun3/sun3x: machdep.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/sun3/sun3x/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sun3/sun3/machdep.c
diff -u src/sys/arch/sun3/sun3/machdep.c:1.202 src/sys/arch/sun3/sun3/machdep.c:1.203
--- src/sys/arch/sun3/sun3/machdep.c:1.202 Sun Jun 12 03:35:48 2011
+++ src/sys/arch/sun3/sun3/machdep.c Tue Jun 14 15:23:19 2011
@@ -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;
}
Index: src/sys/arch/sun3/sun3x/machdep.c
diff -u src/sys/arch/sun3/sun3x/machdep.c:1.129 src/sys/arch/sun3/sun3x/machdep.c:1.130
--- src/sys/arch/sun3/sun3x/machdep.c:1.129 Sun Jun 12 03:35:48 2011
+++ src/sys/arch/sun3/sun3x/machdep.c Tue Jun 14 15:23:19 2011
@@ -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;
}
