D30645.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30645.diff
View Options

	diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h
	--- a/sys/riscv/include/pmap.h
	+++ b/sys/riscv/include/pmap.h
	@@ -160,7 +160,7 @@
	bool pmap_get_tables(pmap_t, vm_offset_t, pd_entry_t , pd_entry_t ,
	pt_entry_t **);

	-int pmap_fault_fixup(pmap_t, vm_offset_t, vm_prot_t);
	+int pmap_fault(pmap_t, vm_offset_t, vm_prot_t);

	static inline int
	pmap_vmspace_copy(pmap_t dst_pmap __unused, pmap_t src_pmap __unused)
	diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
	--- a/sys/riscv/riscv/pmap.c
	+++ b/sys/riscv/riscv/pmap.c
	@@ -2382,7 +2382,7 @@
	}

	int
	-pmap_fault_fixup(pmap_t pmap, vm_offset_t va, vm_prot_t ftype)
	+pmap_fault(pmap_t pmap, vm_offset_t va, vm_prot_t ftype)
	{
	pd_entry_t *l2, l2e;
	pt_entry_t bits, *pte, oldpte;
	diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
	--- a/sys/riscv/riscv/trap.c
	+++ b/sys/riscv/riscv/trap.c
	@@ -226,7 +226,7 @@
	ftype = VM_PROT_READ;
	}

	- if (pmap_fault_fixup(map->pmap, va, ftype))
	+ if (pmap_fault(map->pmap, va, ftype))
	goto done;

	error = vm_fault_trap(map, va, ftype, VM_FAULT_NORMAL, &sig, &ucode);