diff options
| author |   drahn <drahn@openbsd.org> | 2019-07-13 21:47:06 +0000 |
|---|---|---|
| committer | drahn <drahn@openbsd.org> | 2019-07-13 21:47:06 +0000 |
| commit | a355bdb171e109e8c9c4e482f8beabfaacfdb0f9 (patch) | |
| tree | 1708b85a32a5fb44d5953cd3319f5c4ea9ca6cb8 | |
| parent | Adjust the pmap_set_l* functions to a more reasonable API, (diff) | |
| download | wireguard-openbsd-a355bdb171e109e8c9c4e482f8beabfaacfdb0f9.tar.xz wireguard-openbsd-a355bdb171e109e8c9c4e482f8beabfaacfdb0f9.zip | |
Panic for missing vp1 entry, do not panic for missing vp2 entry twice.
Fix print on subsequent line.
| -rw-r--r-- | sys/arch/arm64/arm64/pmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/arm64/arm64/pmap.c b/sys/arch/arm64/arm64/pmap.c index 982d38fa333..fb46ca85841 100644 --- a/sys/arch/arm64/arm64/pmap.c +++ b/sys/arch/arm64/arm64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.65 2019/07/13 21:31:59 drahn Exp $ */ +/* $OpenBSD: pmap.c,v 1.66 2019/07/13 21:47:06 drahn Exp $ */ /* * Copyright (c) 2008-2009,2014-2016 Dale Rahn <drahn@dalerahn.com> * @@ -1668,8 +1668,8 @@ pmap_pte_remove(struct pte_desc *pted, int remove_pted) vp1 = pm->pm_vp.l0->vp[VP_IDX0(pted->pted_va)]; else vp1 = pm->pm_vp.l1; - if (vp1->vp[VP_IDX1(pted->pted_va)] == NULL) { - panic("have a pted, but missing the l2 for %lx va pmap %p", + if (vp1 == NULL) { + panic("have a pted, but missing the l1 for %lx va pmap %p", pted->pted_va, pm); } vp2 = vp1->vp[VP_IDX1(pted->pted_va)]; @@ -1679,7 +1679,7 @@ pmap_pte_remove(struct pte_desc *pted, int remove_pted) } vp3 = vp2->vp[VP_IDX2(pted->pted_va)]; if (vp3 == NULL) { - panic("have a pted, but missing the l2 for %lx va pmap %p", + panic("have a pted, but missing the l3 for %lx va pmap %p", pted->pted_va, pm); } vp3->l3[VP_IDX3(pted->pted_va)] = 0; |