CVS commit: src/sys/arch/arm/arm32

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Fri Jan  1 02:32:29 UTC 2010

Modified Files:
        src/sys/arch/arm/arm32: pmap.c

Log Message:
Sprinkle assertions after calling pmap_get_l2_bucket().


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/arch/arm/arm32/pmap.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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.209 src/sys/arch/arm/arm32/pmap.c:1.210
--- src/sys/arch/arm/arm32/pmap.c:1.209	Thu Dec 31 18:34:56 2009
+++ src/sys/arch/arm/arm32/pmap.c	Fri Jan  1 02:32:28 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.209 2009/12/31 18:34:56 uebayasi Exp $	*/
+/*	$NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.209 2009/12/31 18:34:56 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -1531,6 +1531,7 @@
 
 		pm->pm_pl1vec = &pm->pm_l1->l1_kva[L1_IDX(vector_page)];
 		l2b = pmap_get_l2_bucket(pm, vector_page);
+		KDASSERT(l2b != NULL);
 		pm->pm_l1vec = l2b->l2b_phys | L1_C_PROTO |
 		    L1_C_DOM(pm->pm_domain);
 	} else
@@ -1752,6 +1753,7 @@
 			pv->pv_flags |= PVF_NC;
 
 			l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va);
+			KDASSERT(l2b != NULL);
 			ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
 			pte = *ptep & ~L2_S_CACHE_MASK;
 
@@ -1794,6 +1796,7 @@
 			pv->pv_flags &= ~PVF_NC;
 
 			l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va);
+			KDASSERT(l2b != NULL);
 			ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
 			pte = (*ptep & ~L2_S_CACHE_MASK) | pte_l2_s_cache_mode;
 
@@ -2082,6 +2085,7 @@
 	 */
 	SLIST_FOREACH(pv, &pg->mdpage.pvh_list, pv_link) {
 		l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va);
+		KDASSERT(l2b != NULL);
 		ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
 		opte = *ptep;
 		pte = opte & ~L2_S_CACHE_MASK;
@@ -5231,6 +5235,7 @@
 	if (vector_page < KERNEL_BASE) {
 		pm->pm_pl1vec = &pm->pm_l1->l1_kva[L1_IDX(vector_page)];
 		l2b = pmap_get_l2_bucket(pm, vector_page);
+		KDASSERT(l2b != NULL);
 		pm->pm_l1vec = l2b->l2b_phys | L1_C_PROTO |
 		    L1_C_DOM(pm->pm_domain);
 	} else
@@ -5459,6 +5464,7 @@
 			 * with the cache-mode set to write-through.
 			 */
 			l2b = pmap_get_l2_bucket(pmap_kernel(), va);
+			KDASSERT(l2b != NULL);
 			ptep = &l2b->l2b_kva[l2pte_index(va)];
 			pte = *ptep;
 			pte = (pte & ~L2_S_CACHE_MASK) | pte_l2_s_cache_mode_pt;