svn commit: r204438 - in stable/8/sys/ia64: ia64 include

[Marcel Moolenaar]

Author: marcel
Date: Sun Feb 28 01:25:12 2010
New Revision: 204438
URL: http://svn.freebsd.org/changeset/base/204438

Log:
  MFC rev 204182:
  Remove pm_active from struct pmap as it serves no purpose.

Modified:
  stable/8/sys/ia64/ia64/pmap.c
  stable/8/sys/ia64/include/pmap.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/ia64/ia64/pmap.c
==============================================================================
--- stable/8/sys/ia64/ia64/pmap.c	Sat Feb 27 23:42:32 2010	(r204437)
+++ stable/8/sys/ia64/ia64/pmap.c	Sun Feb 28 01:25:12 2010	(r204438)
@@ -453,7 +453,6 @@ pmap_bootstrap()
 	PMAP_LOCK_INIT(kernel_pmap);
 	for (i = 0; i < 5; i++)
 		kernel_pmap->pm_rid[i] = 0;
-	kernel_pmap->pm_active = 1;
 	TAILQ_INIT(&kernel_pmap->pm_pvlist);
 	PCPU_SET(md.current_pmap, kernel_pmap);
 
@@ -662,7 +661,6 @@ pmap_pinit(struct pmap *pmap)
 	PMAP_LOCK_INIT(pmap);
 	for (i = 0; i < 5; i++)
 		pmap->pm_rid[i] = pmap_allocate_rid();
-	pmap->pm_active = 0;
 	TAILQ_INIT(&pmap->pm_pvlist);
 	bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
 	return (1);
@@ -2246,8 +2244,6 @@ pmap_switch(pmap_t pm)
 	prevpm = PCPU_GET(md.current_pmap);
 	if (prevpm == pm)
 		goto out;
-	if (prevpm != NULL)
-		atomic_clear_32(&prevpm->pm_active, PCPU_GET(cpumask));
 	if (pm == NULL) {
 		for (i = 0; i < 5; i++) {
 			ia64_set_rr(IA64_RR_BASE(i),
@@ -2258,7 +2254,6 @@ pmap_switch(pmap_t pm)
 			ia64_set_rr(IA64_RR_BASE(i),
 			    (pm->pm_rid[i] << 8)|(PAGE_SHIFT << 2)|1);
 		}
-		atomic_set_32(&pm->pm_active, PCPU_GET(cpumask));
 	}
 	PCPU_SET(md.current_pmap, pm);
 	ia64_srlz_d();

Modified: stable/8/sys/ia64/include/pmap.h
==============================================================================
--- stable/8/sys/ia64/include/pmap.h	Sat Feb 27 23:42:32 2010	(r204437)
+++ stable/8/sys/ia64/include/pmap.h	Sun Feb 28 01:25:12 2010	(r204438)
@@ -76,7 +76,6 @@ struct pmap {
 	struct mtx		pm_mtx;
 	TAILQ_HEAD(,pv_entry)	pm_pvlist;	/* list of mappings in pmap */
 	u_int32_t		pm_rid[5];	/* base RID for pmap */
-	int			pm_active;	/* active flag */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 };