 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.128 2011/08/14 02:31:08 rmind Exp $	*/
+/*	$NetBSD: pmap.c,v 1.129 2011/08/28 00:51:21 dyoung Exp $	*/
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -161,27 +161,27 @@
  *     Hibler/Jolitz pmap, as modified for FreeBSD by John S. Dyson
  *     and David Greenman.
+ *
  * [3] the Mach pmap.   this pmap, from CMU, seems to have migrated
  *     between several processors.   the VAX version was done by
  *     Avadis Tevanian, Jr., and Michael Wayne Young.    the i386
  *     version was done by Lance Berc, Mike Kupfer, Bob Baron,
  *     David Golub, and Richard Draves.    the alpha version was
  *     done by Alessandro Forin (CMU/Mach) and Chris Demetriou
  *     (NetBSD/alpha).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.128 2011/08/14 02:31:08 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.129 2011/08/28 00:51:21 dyoung Exp $");
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #if !defined(__x86_64__)
 #include "opt_kstack_dr0.h"
 #endif /* !defined(__x86_64__) */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -1059,27 +1059,27 @@ pmap_emap_sync(bool canload)
 void
 pmap_emap_remove(vaddr_t sva, vsize_t len)
+{
 	pt_entry_t *pte, xpte;
 	vaddr_t va, eva = sva + len;
 	for (va = sva; va < eva; va += PAGE_SIZE) {
 		pte = (va < VM_MIN_KERNEL_ADDRESS) ? vtopte(va) : kvtopte(va);
 		xpte |= pmap_pte_testset(pte, 0);
+	}
+}
-__weak_alias(pmap_kenter_ma, pmap_kenter_pa);
+__strict_weak_alias(pmap_kenter_ma, pmap_kenter_pa);
 #if defined(__x86_64__)
 /*
  * Change protection for a virtual address. Local for a CPU only, don't
  * care about TLB shootdowns.
+ *
  * => must be called with preemption disabled
  */
 void
 pmap_changeprot_local(vaddr_t va, vm_prot_t prot)
+{
 	pt_entry_t *pte, opte, npte;
 @@ -2872,27 +2872,27 @@ pmap_extract(struct pmap *pmap, vaddr_t
  * machine-dependent code only.
  */
 paddr_t
 vtophys(vaddr_t va)
+{
 	paddr_t pa;
 	if (pmap_extract(pmap_kernel(), va, &pa) == true)
 		return (pa);
 	return (0);
+}
-__weak_alias(pmap_extract_ma, pmap_extract);
+__strict_weak_alias(pmap_extract_ma, pmap_extract);
 #ifdef XEN
 /*
  * vtomach: virtual address to machine address.  For use by
  * machine-dependent code only.
  */
 paddr_t
 vtomach(vaddr_t va)
+{
 	paddr_t pa;
 @@ -3770,27 +3770,27 @@ pmap_unwire(struct pmap *pmap, vaddr_t v
+}
 /*
  * pmap_copy: copy mappings from one pmap to another
+ *
  * => optional function
  * void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)
  */
 /*
  * defined as macro in pmap.h
  */
-__weak_alias(pmap_enter, pmap_enter_default);
+__strict_weak_alias(pmap_enter, pmap_enter_default);
 int
 pmap_enter_default(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot,
     u_int flags)
+{
 	return pmap_enter_ma(pmap, va, pa, pa, prot, flags, 0);
+}
 /*
  * pmap_enter: enter a mapping into a pmap
+ *
  * => must be done "now" ... no lazy-evaluation
  * => we set pmap => pv_head locking