Sun Jan 29 16:24:51 2012 UTC ()

convert from malloc(9) to kmem(9)


(para)

diff -r1.166 -r1.167 src/sys/arch/sun3/sun3/pmap.c

--- src/sys/arch/sun3/sun3/pmap.c 2011/06/03 17:03:53	1.166
+++ src/sys/arch/sun3/sun3/pmap.c 2012/01/29 16:24:51	1.167

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.166 2011/06/03 17:03:53 tsutsui Exp $	*/
+/*	$NetBSD: pmap.c,v 1.167 2012/01/29 16:24:51 para Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass and Gordon W. Ross.
+ *
  * 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.
 @@ -70,35 +70,35 @@
  * to handle some I/O then going back to sleep (i.e. nfsd).
  * If and when such a process returns to user-mode, it will
  * fault and be given a real context at that time.
+ *
  * This also lets context switch be fast, because all we need
  * to do there for the MMU is slam the context register.
+ *
  * Project2:  Use a private pool of PV elements.  This pool can be
  * fixed size because the total mapped virtual space supported by
  * the MMU H/W (and this pmap) is fixed for all time.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.166 2011/06/03 17:03:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.167 2012/01/29 16:24:51 para Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/queue.h>
 #include <sys/kcore.h>
 #include <sys/atomic.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <machine/dvma.h>
 #include <machine/idprom.h>
 #include <machine/kcore.h>
 #include <machine/mon.h>
 #include <machine/pmap.h>
 @@ -1839,27 +1839,27 @@ pmap_map(vaddr_t va, paddr_t pa, paddr_t
 		pmap_enter(kernel_pmap, va, pa, prot, 0);
 		va += PAGE_SIZE;
 		pa += PAGE_SIZE;
 		sz -= PAGE_SIZE;
 	} while (sz > 0);
 	pmap_update(kernel_pmap);
 	return(va);
+}
 void
 pmap_user_init(pmap_t pmap)
+{
 	int i;
-	pmap->pm_segmap = malloc(sizeof(char)*NUSEG, M_VMPMAP, M_WAITOK);
+	pmap->pm_segmap = kmem_alloc(sizeof(char)*NUSEG, KM_SLEEP);
 	for (i = 0; i < NUSEG; i++) {
 		pmap->pm_segmap[i] = SEGINV;
+	}
+}
 /*
  *	Create and return a physical map.
+ *
  *	If the size specified for the map
  *	is zero, the map is an actual physical
  *	map, and may be referenced by the
  *	hardware.
+ *
 @@ -1890,27 +1890,27 @@ pmap_release(struct pmap *pmap)
 	s = splvm();
 	if (pmap == kernel_pmap)
 		panic("pmap_release: kernel_pmap!");
 	if (has_context(pmap)) {
 #ifdef	PMAP_DEBUG
 		if (pmap_debug & PMD_CONTEXT)
 			printf("pmap_release(%p): free ctx %d\n",
 			       pmap, pmap->pm_ctxnum);
 #endif
 		context_free(pmap);
+	}
-	free(pmap->pm_segmap, M_VMPMAP);
+	kmem_free(pmap->pm_segmap, sizeof(char)*NUSEG);
 	pmap->pm_segmap = NULL;
 	splx(s);
+}
 /*
  *	Retire the given physical map from service.
  *	Should only be called if the map contains
  *	no valid mappings.
  */
 void
 pmap_destroy(pmap_t pmap)