Attachment 210689 Details for Bug 242137 – svnlite_diff_stable_12__r352513_r352517.patch

[patch] svnlite_diff_stable_12__r352513_r352517.patch

svnlite_diff_stable_12__r352513_r352517.patch (text/plain), 2.59 KB, created by Vinícius Zavam on 2020-01-13 10:37:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2020-01-13 10:37:59 UTC

Size: 2.59 KB

patch

obsolete

>Index: sys/amd64/amd64/pmap.c
>===================================================================
>--- sys/amd64/amd64/pmap.c	(revision 352513)
>+++ sys/amd64/amd64/pmap.c	(revision 352517)
>@@ -5214,8 +5214,7 @@
> pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot)
> {
> 	pd_entry_t newpde, oldpde;
>-	vm_offset_t eva, va;
>-	vm_page_t m;
>+	vm_page_t m, mt;
> 	boolean_t anychanged;
> 	pt_entry_t PG_G, PG_M, PG_RW;
> 
>@@ -5229,15 +5228,15 @@
> 	anychanged = FALSE;
> retry:
> 	oldpde = newpde = *pde;
>-	if ((oldpde & (PG_MANAGED | PG_M | PG_RW)) ==
>-	    (PG_MANAGED | PG_M | PG_RW)) {
>-		eva = sva + NBPDR;
>-		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
>-		    va < eva; va += PAGE_SIZE, m++)
>-			vm_page_dirty(m);
>+	if ((prot & VM_PROT_WRITE) == 0) {
>+		if ((oldpde & (PG_MANAGED | PG_M | PG_RW)) ==
>+		    (PG_MANAGED | PG_M | PG_RW)) {
>+			m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
>+			for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
>+				vm_page_dirty(mt);
>+		}
>+		newpde &= ~(PG_RW | PG_M);
> 	}
>-	if ((prot & VM_PROT_WRITE) == 0)
>-		newpde &= ~(PG_RW | PG_M);
> 	if ((prot & VM_PROT_EXECUTE) == 0)
> 		newpde |= pg_nx;
> 	if (newpde != oldpde) {
>Index: sys/i386/i386/pmap.c
>===================================================================
>--- sys/i386/i386/pmap.c	(revision 352513)
>+++ sys/i386/i386/pmap.c	(revision 352517)
>@@ -3332,8 +3332,7 @@
> pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot)
> {
> 	pd_entry_t newpde, oldpde;
>-	vm_offset_t eva, va;
>-	vm_page_t m;
>+	vm_page_t m, mt;
> 	boolean_t anychanged;
> 
> 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
>@@ -3342,15 +3341,15 @@
> 	anychanged = FALSE;
> retry:
> 	oldpde = newpde = *pde;
>-	if ((oldpde & (PG_MANAGED | PG_M | PG_RW)) ==
>-	    (PG_MANAGED | PG_M | PG_RW)) {
>-		eva = sva + NBPDR;
>-		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
>-		    va < eva; va += PAGE_SIZE, m++)
>-			vm_page_dirty(m);
>+	if ((prot & VM_PROT_WRITE) == 0) {
>+		if ((oldpde & (PG_MANAGED | PG_M | PG_RW)) ==
>+		    (PG_MANAGED | PG_M | PG_RW)) {
>+			m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
>+			for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
>+				vm_page_dirty(mt);
>+		}
>+		newpde &= ~(PG_RW | PG_M);
> 	}
>-	if ((prot & VM_PROT_WRITE) == 0)
>-		newpde &= ~(PG_RW | PG_M);
> #if defined(PAE) || defined(PAE_TABLES)
> 	if ((prot & VM_PROT_EXECUTE) == 0)
> 		newpde |= pg_nx;
>Index: .
>===================================================================
>--- .	(revision 352513)
>+++ .	(revision 352517)
>
>Property changes on: .
>___________________________________________________________________
>Modified: svn:mergeinfo
>## -0,0 +0,1 ##
>   Merged /head:r349526

Actions: View | Diff

Attachments on bug 242137: 209404 | 209405 | 209450 | 209680 | 209689 | 210496 | 210689 | 210690 | 210691 | 210708