Wed Apr 27 07:42:11 2011 UTC ()

drop 'inline' here, to avoid C99 vs GNU differences


(plunky)

diff -r1.119 -r1.120 src/sys/arch/x86/x86/pmap.c

--- src/sys/arch/x86/x86/pmap.c 2011/04/14 16:00:21	1.119
+++ src/sys/arch/x86/x86/pmap.c 2011/04/27 07:42:11	1.120

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.119 2011/04/14 16:00:21 yamt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.120 2011/04/27 07:42:11 plunky Exp $	*/
 /*
  * Copyright (c) 2007 Manuel Bouyer.
+ *
  * 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.
+ *
 @@ -132,27 +132,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.119 2011/04/14 16:00:21 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.120 2011/04/27 07:42:11 plunky 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>
 @@ -757,27 +757,27 @@ pmap_unmap_apdp(void)
 	for (i = 0; i < PDP_SIZE; i++) {
 		pmap_pte_set(APDP_PDE+i, 0);
 #if defined (XEN) && defined (PAE)
 		/* clear shadow entries too */
 		pmap_pte_set(APDP_PDE_SHADOW+i, 0);
 #endif
+	}
+}
 /*
  *	Add a reference to the specified pmap.
  */
-inline void
+void
 pmap_reference(struct pmap *pmap)
+{
 	atomic_inc_uint(&pmap->pm_obj[0].uo_refs);
+}
 /*
  * pmap_map_ptes: map a pmap's PTEs into KVM and lock them in
+ *
  * => we lock enough pmaps to keep things locked in
  * => must be undone with pmap_unmap_ptes before returning
  */