Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge botch. KERNBASE macro was split into KERNBASE3 and KERNBASE3X

Browse Source 
for kernel, and was replaced with kernbase constant for possible reference
of USRSTACK in module(7).
This commit is contained in:
tsutsui 2011-06-14 15:23:19 +00:00
parent 50feb1fb19
commit aafa5da558
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sun3/sun3/machdep.c
View File

@ -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 @@ mm_md_direct_mapped_phys(paddr_t paddr, vaddr_t *vaddr)
if (paddr >= avail_start)
return false;
*vaddr = KERNBASE + paddr;
*vaddr = KERNBASE3 + paddr;
return true;
}

6
sys/arch/sun3/sun3x/machdep.c
View File

@ -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 @@ mm_md_direct_mapped_phys(paddr_t paddr, vaddr_t *vaddr)
if (paddr >= avail_start)
return false;
*vaddr = KERNBASE + paddr;
*vaddr = KERNBASE3X + paddr;
return true;
}