Module Name: src
Committed By: matt
Date: Wed Apr 2 11:36:50 UTC 2014
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Don't map ebsabootinfo.bt_vargp if it is the same address as the vector page
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/cats/cats/cats_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/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.77 src/sys/arch/cats/cats/cats_machdep.c:1.78
--- src/sys/arch/cats/cats/cats_machdep.c:1.77 Sun Aug 18 06:50:31 2013
+++ src/sys/arch/cats/cats/cats_machdep.c Wed Apr 2 11:36:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.77 2013/08/18 06:50:31 matt Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.78 2014/04/02 11:36:50 matt Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.77 2013/08/18 06:50:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.78 2014/04/02 11:36:50 matt Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -622,8 +622,10 @@ initarm(void *arm_bootargs)
#endif
/* Map the boot arguments page */
- pmap_map_entry(l1pagetable, ebsabootinfo.bt_vargp,
- ebsabootinfo.bt_pargp, VM_PROT_READ, PTE_CACHE);
+ if (ebsabootinfo.bt_vargp != vector_page) {
+ pmap_map_entry(l1pagetable, ebsabootinfo.bt_vargp,
+ ebsabootinfo.bt_pargp, VM_PROT_READ, PTE_CACHE);
+ }
/* Map the stack pages */
pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa,
