svn commit: r269368 - in head/sys/powerpc: aim include

Alan Cox alc at FreeBSD.org
Fri Aug 1 04:53:36 UTC 2014


Author: alc
Date: Fri Aug  1 04:53:35 2014
New Revision: 269368
URL: http://svnweb.freebsd.org/changeset/base/269368

Log:
  Retire PVO_EXECUTABLE.  It's neither used nor set correctly.

Modified:
  head/sys/powerpc/aim/mmu_oea.c
  head/sys/powerpc/include/pmap.h

Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c	Fri Aug  1 04:05:13 2014	(r269367)
+++ head/sys/powerpc/aim/mmu_oea.c	Fri Aug  1 04:53:35 2014	(r269368)
@@ -1184,9 +1184,6 @@ moea_enter_locked(pmap_t pmap, vm_offset
 	} else
 		pte_lo |= PTE_BR;
 
-	if (prot & VM_PROT_EXECUTE)
-		pvo_flags |= PVO_EXECUTABLE;
-
 	if (wired)
 		pvo_flags |= PVO_WIRED;
 
@@ -1742,8 +1739,6 @@ moea_protect(mmu_t mmu, pmap_t pm, vm_of
 	for (pvo = RB_NFIND(pvo_tree, &pm->pmap_pvo, &key);
 	    pvo != NULL && PVO_VADDR(pvo) < eva; pvo = tpvo) {
 		tpvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo);
-		if ((prot & VM_PROT_EXECUTE) == 0)
-			pvo->pvo_vaddr &= ~PVO_EXECUTABLE;
 
 		/*
 		 * Grab the PTE pointer before we diddle with the cached PTE
@@ -1999,8 +1994,6 @@ moea_pvo_enter(pmap_t pm, uma_zone_t zon
 	pvo->pvo_pmap = pm;
 	LIST_INSERT_HEAD(&moea_pvo_table[ptegidx], pvo, pvo_olink);
 	pvo->pvo_vaddr &= ~ADDR_POFF;
-	if (flags & VM_PROT_EXECUTE)
-		pvo->pvo_vaddr |= PVO_EXECUTABLE;
 	if (flags & PVO_WIRED)
 		pvo->pvo_vaddr |= PVO_WIRED;
 	if (pvo_head != &moea_pvo_kunmanaged)

Modified: head/sys/powerpc/include/pmap.h
==============================================================================
--- head/sys/powerpc/include/pmap.h	Fri Aug  1 04:05:13 2014	(r269367)
+++ head/sys/powerpc/include/pmap.h	Fri Aug  1 04:53:35 2014	(r269368)
@@ -112,7 +112,6 @@ RB_PROTOTYPE(pvo_tree, pvo_entry, pvo_pl
 #define	PVO_PTEGIDX_VALID	0x008UL		/* slot is valid */
 #define	PVO_WIRED		0x010UL		/* PVO entry is wired */
 #define	PVO_MANAGED		0x020UL		/* PVO entry is managed */
-#define	PVO_EXECUTABLE		0x040UL		/* PVO entry is executable */
 #define	PVO_BOOTSTRAP		0x080UL		/* PVO entry allocated during
 						   bootstrap */
 #define PVO_LARGE		0x200UL		/* large page */


More information about the svn-src-head mailing list