 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.c,v 1.33 2010/11/15 06:06:51 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.34 2012/01/30 17:03:58 he Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -92,30 +92,30 @@
  * SVC mode, and pmap_enter() will be explicitly told what to do to
  * the referenced/modified bits.
+ *
  * Breaking these rules (especially the first) is likely to upset
  * referenced/modified emulation.
  */
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
 #include "arcvideo.h"
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33 2010/11/15 06:06:51 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.34 2012/01/30 17:03:58 he Exp $");
 #include <sys/kernel.h> /* for cold */
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/systm.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_stat.h>
 #include <arm/cpuconf.h>
 #include <machine/intr.h>
 #include <machine/machdep.h>
 #include <machine/memcreg.h>
 @@ -337,27 +337,27 @@ pmap_init(void)
  */
 void
 pmap_init2()
+{
 	struct pmap *pmap;
 	struct pv_entry *new_pv_table, *old_pv_table;
 	size_t pv_table_size;
 	int lpn;
 	UVMHIST_FUNC("pmap_init2");
 	UVMHIST_CALLED(pmaphist);
 	/* We can now call malloc().  Rationalise our memory usage. */
 	pv_table_size = physmem * sizeof(struct pv_entry);
-	new_pv_table = malloc(pv_table_size, M_VMPMAP, M_WAITOK);
+	new_pv_table = kmem_alloc(pv_table_size, KM_SLEEP);
 	memcpy(new_pv_table, pv_table, pv_table_size);
 	old_pv_table = pv_table;
 	pv_table = new_pv_table;
 	/* Fix up the kernel pmap to point at new pv_entries. */
 	pmap = pmap_kernel();
 	for (lpn = 0; lpn < 1024; lpn++)
 		if (pmap->pm_entries[lpn] ==
 		    old_pv_table + pmap->pm_entries[lpn]->pv_ppn)
 			pmap->pm_entries[lpn] =
 			    pv_table + pmap->pm_entries[lpn]->pv_ppn;
 	uvm_pagefree(PHYS_TO_VM_PAGE(
 @@ -370,53 +370,54 @@ pmap_init2()
+}
 struct pmap *
 pmap_create(void)
+{
 	struct pmap *pmap;
 	UVMHIST_FUNC("pmap_create");
 	UVMHIST_CALLED(pmaphist);
 	if (!pmap_initialised)
 		pmap_init2();
 	pmap = pool_get(&pmap_pool, PR_WAITOK);
 	memset(pmap, 0, sizeof(*pmap));
-	pmap->pm_entries = (struct pv_entry **)malloc(
+	pmap->pm_entries = (struct pv_entry **)kmem_zalloc(
-		sizeof(struct pv_entry *) * PM_NENTRIES, M_VMPMAP,
+		sizeof(struct pv_entry *) * PM_NENTRIES,
-		M_WAITOK | M_ZERO);
+		KM_SLEEP);
 	pmap->pm_count = 1;
 	return pmap;
+}
 void
 pmap_destroy(pmap_t pmap)
+{
 #ifdef DIAGNOSTIC
 	int i;
 #endif
 	UVMHIST_FUNC("pmap_destroy");
 	UVMHIST_CALLED(pmaphist);
 	if (--pmap->pm_count > 0)
 		return;
 	KASSERT((pmap->pm_flags & PM_ACTIVE) == 0);
 	KASSERT(pmap->pm_stats.resident_count == 0);
 	KASSERT(pmap->pm_stats.wired_count == 0);
 #ifdef DIAGNOSTIC
 	for (i = 0; i < 1024; i++)
 		if (pmap->pm_entries[i] != NULL)
 			panic("pmap_destroy: pmap isn't empty");
 #endif
-	free((void *)pmap->pm_entries, M_VMPMAP);
+	kmem_free((void *)pmap->pm_entries,
 		sizeof(struct pv_entry *) * PM_NENTRIES);
 	pool_put(&pmap_pool, pmap);
+}
 long
 _pmap_resident_count(pmap_t pmap)
+{
 	return pmap->pm_stats.resident_count;
+}
 long
 _pmap_wired_count(pmap_t pmap)
+{
 @@ -521,34 +522,34 @@ pv_update(struct pv_entry *pv)
 		        ppl = MEMC_PPL_RDONLY;
 		else
 			ppl = MEMC_PPL_NOACCESS;
+	}
 	pv->pv_ppl = ppl;
 	pv->pv_activate = MEMC_TRANS_ENTRY_32K(pv->pv_ppn, pv->pv_lpn, ppl);
 	pv->pv_deactivate = PMAP_UNMAP_ENTRY_32K(pv->pv_ppn);
+}
 static struct pv_entry *
 pv_alloc(void)
+{
-	return malloc(sizeof(struct pv_entry), M_VMPMAP, M_NOWAIT | M_ZERO);
+	return kmem_intr_zalloc(sizeof(struct pv_entry), KM_NOSLEEP);
+}
 static void
 pv_free(struct pv_entry *pv)
+{
-	free(pv, M_VMPMAP);
+	kmem_intr_free(pv, sizeof(struct pv_entry));
+}
 static struct pv_entry *
 pv_get(pmap_t pmap, int ppn, int lpn)
+{
 	struct pv_entry *pv;
 	UVMHIST_FUNC("pv_get");
 	UVMHIST_CALLED(pmaphist);
 	UVMHIST_LOG(pmaphist, "(pmap=%p, ppn=%d, lpn=%d)", pmap, ppn, lpn, 0);
 	/* If the head entry's free use that. */
 	pv = &pv_table[ppn];
 	if (pv->pv_pmap == NULL) {