D14062.id.diff
No OneTemporary
Actions

Size

941 B

Referenced Files

None

Subscribers

None

D14062.id.diff
View Options

	Index: head/sys/amd64/amd64/pmap.c
	===================================================================
	--- head/sys/amd64/amd64/pmap.c
	+++ head/sys/amd64/amd64/pmap.c
	@@ -2338,7 +2338,7 @@
	pa = VM_PAGE_TO_PHYS(m) \| cache_bits;
	if ((*pte & (PG_FRAME \| X86_PG_PTE_CACHE)) != pa) {
	oldpte \|= *pte;
	- pte_store(pte, pa \| pg_g \| X86_PG_RW \| X86_PG_V);
	+ pte_store(pte, pa \| pg_g \| pg_nx \| X86_PG_RW \| X86_PG_V);
	}
	pte++;
	}
	Index: head/sys/i386/i386/pmap.c
	===================================================================
	--- head/sys/i386/i386/pmap.c
	+++ head/sys/i386/i386/pmap.c
	@@ -1677,7 +1677,11 @@
	pa = VM_PAGE_TO_PHYS(m) \| pmap_cache_bits(m->md.pat_mode, 0);
	if ((*pte & (PG_FRAME \| PG_PTE_CACHE)) != pa) {
	oldpte \|= *pte;
	+#if defined(PAE) \|\| defined(PAE_TABLES)
	+ pte_store(pte, pa \| pgeflag \| pg_nx \| PG_RW \| PG_V);
	+#else
	pte_store(pte, pa \| pgeflag \| PG_RW \| PG_V);
	+#endif
	}
	pte++;
	}