PERFORCE change 122634 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=122634

Change 122634 by peter at peter_melody on 2007/07/01 10:47:23

	Make gcc4.2 happy.  I suspect it would be better to just
	let the unit-at-a-time mode decide what to inline.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#160 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#160 (text+ko) ====

@@ -831,16 +831,23 @@
  * Normal, non-SMP, invalidation functions.
  * We inline these within pmap.c for speed.
  */
-PMAP_INLINE void
-pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
+static __inline void
+_pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 {
 
 	if (pmap == kernel_pmap || pmap->pm_active)
 		invlpg(va);
 }
+void
+pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
+{
+
+	_pmap_invalidate_page(pmap, va);
+}
+#define pmap_invalidate_page(p, v) _pmap_invalidate_page(p, v)
 
-PMAP_INLINE void
-pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
+static __inline void
+_pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	vm_offset_t addr;
 
@@ -848,21 +855,43 @@
 		for (addr = sva; addr < eva; addr += PAGE_SIZE)
 			invlpg(addr);
 }
+void
+pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
+{
 
-PMAP_INLINE void
-pmap_invalidate_all(pmap_t pmap)
+	_pmap_invalidate_range(pmap, sva, eva);
+}
+#define pmap_invalidate_range(p, s, e) _pmap_invalidate_range(p, s, e)
+
+static __inline void
+_pmap_invalidate_all(pmap_t pmap)
 {
 
 	if (pmap == kernel_pmap || pmap->pm_active)
 		invltlb();
 }
+void
+pmap_invalidate_all(pmap_t pmap)
+{
+
+	_pmap_invalidate_all(pmap);
+}
+#define pmap_invalidate_all(p) _pmap_invalidate_all(p)
+
 
-PMAP_INLINE void
+static __inline void
+_pmap_invalidate_cache(void)
+{
+
+	wbinvd();
+}
+void
 pmap_invalidate_cache(void)
 {
 
-	wbinvd();
+	pmap_invalidate_cache();
 }
+#define pmap_invalidate_cache() _pmap_invalidate_cache()
 #endif /* !SMP */
 
 /*