D22141.diff
No OneTemporary
Actions

Size

911 B

Referenced Files

None

Subscribers

None

D22141.diff
View Options

	Index: head/sys/arm64/arm64/pmap.c
	===================================================================
	--- head/sys/arm64/arm64/pmap.c
	+++ head/sys/arm64/arm64/pmap.c
	@@ -1257,12 +1257,8 @@
	KASSERT((size & PAGE_MASK) == 0,
	("pmap_kenter: Mapping is not page-sized"));

	- attr = ATTR_DEFAULT \| ATTR_IDX(mode) \| L3_PAGE;
	- if (mode == DEVICE_MEMORY)
	- attr \|= ATTR_XN;
	- else
	- attr \|= ATTR_UXN;
	-
	+ attr = ATTR_DEFAULT \| ATTR_AP(ATTR_AP_RW) \| ATTR_XN \| ATTR_IDX(mode) \|
	+ L3_PAGE;
	va = sva;
	while (size != 0) {
	pde = pmap_pde(kernel_pmap, va, &lvl);
	@@ -1377,9 +1373,7 @@

	m = ma[i];
	pa = VM_PAGE_TO_PHYS(m) \| ATTR_DEFAULT \| ATTR_AP(ATTR_AP_RW) \|
	- ATTR_UXN \| ATTR_IDX(m->md.pv_memattr) \| L3_PAGE;
	- if (m->md.pv_memattr == DEVICE_MEMORY)
	- pa \|= ATTR_XN;
	+ ATTR_XN \| ATTR_IDX(m->md.pv_memattr) \| L3_PAGE;
	pte = pmap_l2_to_l3(pde, va);
	pmap_load_store(pte, pa);