svn commit: r206979 - in user/kmacy/head_page_lock_2/sys/amd64: amd64 include

[Kip Macy]

Author: kmacy
Date: Wed Apr 21 04:58:48 2010
New Revision: 206979
URL: http://svn.freebsd.org/changeset/base/206979

Log:
   - print gen_count in panic
   - eliminate while{ }do(0) for one line macro

Modified:
  user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c
  user/kmacy/head_page_lock_2/sys/amd64/include/pmap.h

Modified: user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c	Wed Apr 21 04:44:08 2010	(r206978)
+++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c	Wed Apr 21 04:58:48 2010	(r206979)
@@ -2018,8 +2018,8 @@ pmap_release(pmap_t pmap)
 	vm_page_t m;
 
 	KASSERT(pmap->pm_stats.resident_count == 0,
-	    ("pmap_release: pmap resident count %ld != 0 retries == %d ",
-		pmap->pm_stats.resident_count, pmap->pm_retries));
+	    ("pmap_release: pmap resident count %ld != 0 retries == %d gen_count == %d",
+		pmap->pm_stats.resident_count, pmap->pm_retries, pmap->pm_gen_count));
 	KASSERT(pmap->pm_root == NULL,
 	    ("pmap_release: pmap has reserved page table page(s)"));
 

Modified: user/kmacy/head_page_lock_2/sys/amd64/include/pmap.h
==============================================================================
--- user/kmacy/head_page_lock_2/sys/amd64/include/pmap.h	Wed Apr 21 04:44:08 2010	(r206978)
+++ user/kmacy/head_page_lock_2/sys/amd64/include/pmap.h	Wed Apr 21 04:58:48 2010	(r206979)
@@ -259,10 +259,7 @@ typedef struct pmap	*pmap_t;
 extern struct pmap	kernel_pmap_store;
 #define kernel_pmap	(&kernel_pmap_store)
 
-#define PMAP_UPDATE_GEN_COUNT(pmap)				\
-	do {							\
-		pmap->pm_gen_count++;				\
-	} while (0)
+#define PMAP_UPDATE_GEN_COUNT(pmap) (pmap)->pm_gen_count++
 
 #define	PMAP_LOCK(pmap)						\
 	do {							\