svn commit: r255680 - projects/bhyve_npt_pmap/sys/amd64/amd64

[Neel Natu]

Author: neel
Date: Wed Sep 18 23:02:38 2013
New Revision: 255680
URL: http://svnweb.freebsd.org/changeset/base/255680

Log:
  Replace explicit calls to panic() with KASSERT() instead.
  
  Requested by:	kib@

Modified:
  projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c

Modified: projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c	Wed Sep 18 22:26:41 2013	(r255679)
+++ projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c	Wed Sep 18 23:02:38 2013	(r255680)
@@ -1166,8 +1166,8 @@ pmap_update_pde_invalidate(pmap_t pmap, 
 	if (pmap->pm_type == PT_EPT)
 		return;
 
-	if (pmap->pm_type != PT_X86)
-		panic("pmap_update_pde_invalidate: bad type %d", pmap->pm_type);
+	KASSERT(pmap->pm_type == PT_X86,
+	    ("pmap_update_pde_invalidate: invalid type %d", pmap->pm_type));
 
 	PG_G = pmap_global_bit(pmap);
 
@@ -1281,8 +1281,8 @@ pmap_invalidate_page(pmap_t pmap, vm_off
 		return;
 	}
 
-	if (pmap->pm_type != PT_X86)
-		panic("pmap_invalidate_page: invalid type %d", pmap->pm_type);
+	KASSERT(pmap->pm_type == PT_X86,
+	    ("pmap_invalidate_page: invalid type %d", pmap->pm_type));
 
 	sched_pin();
 	if (pmap == kernel_pmap || !CPU_CMP(&pmap->pm_active, &all_cpus)) {
@@ -1359,8 +1359,8 @@ pmap_invalidate_range(pmap_t pmap, vm_of
 		return;
 	}
 
-	if (pmap->pm_type != PT_X86)
-		panic("pmap_invalidate_range: invalid type %d", pmap->pm_type);
+	KASSERT(pmap->pm_type == PT_X86,
+	    ("pmap_invalidate_range: invalid type %d", pmap->pm_type));
 
 	sched_pin();
 	if (pmap == kernel_pmap || !CPU_CMP(&pmap->pm_active, &all_cpus)) {
@@ -1418,8 +1418,8 @@ pmap_invalidate_all(pmap_t pmap)
 		return;
 	}
 
-	if (pmap->pm_type != PT_X86)
-		panic("pmap_invalidate_all: invalid type %d", pmap->pm_type);
+	KASSERT(pmap->pm_type == PT_X86,
+	    ("pmap_invalidate_all: invalid type %d", pmap->pm_type));
 
 	sched_pin();
 	cpuid = PCPU_GET(cpuid);
@@ -5919,11 +5919,11 @@ pmap_clear_modify(vm_page_t m)
 					pte = pmap_pde_to_pte(pde, va);
 					oldpte = *pte;
 
-					if ((oldpte & (PG_RO | PG_RW | PG_M)) !=
-						(PG_RW | PG_M))
-						panic("inconsistent pte %#lx "
-						    "after demotion from pde "
-						    "%#lx", oldpte, oldpde);
+					KASSERT((oldpte & (PG_RO|PG_RW|PG_M)) ==
+					    (PG_RW | PG_M),
+					    ("inconsistent pte %#lx after "
+					    "demotion from pde %#lx",
+					    oldpte, oldpde));
 
 					while (!atomic_cmpset_long(pte, oldpte,
 					    oldpte & ~(PG_M | PG_RW)))