D41559.diff
No OneTemporary
Actions

Size

851 B

Referenced Files

None

Subscribers

None

D41559.diff
View Options

	diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
	--- a/sys/arm/arm/pmap-v6.c
	+++ b/sys/arm/arm/pmap-v6.c
	@@ -1109,9 +1109,6 @@
	pte2 = pte2_load(pt2map_entry(va));
	pa = pte2_pa(pte2) \| (va & PTE2_OFFSET);
	}
	- else {
	- panic("%s: va %#x pte1 %#x", __func__, va, pte1);
	- }
	return (pa);
	}

	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
	@@ -982,7 +982,7 @@
	} else {
	l2 = pmap_l2(kernel_pmap, va);
	if (l2 == NULL)
	- panic("pmap_kextract: No l2");
	+ return (0);
	l2e = pmap_load(l2);
	/*
	* Beware of concurrent promotion and demotion! We must
	@@ -1001,7 +1001,7 @@

	l3 = pmap_l2_to_l3(&l2e, va);
	if (l3 == NULL)
	- panic("pmap_kextract: No l3...");
	+ return (0);
	pa = PTE_TO_PHYS(pmap_load(l3));
	pa \|= (va & PAGE_MASK);
	}