diff options
| author | kib <kib@FreeBSD.org> | 2014-08-24 07:59:01 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-08-24 07:59:01 +0000 |
| commit | b1ece437b7748621dda38ed09f2963c1512c3d72 (patch) | |
| tree | cabc606369ae00a216ddcbbe16c5e179867ef8f0 | |
| parent | 4fe668ee1aeb46cf8ac1ea15ec1905e4f1a2fcf4 (diff) | |
| download | FreeBSD-src-b1ece437b7748621dda38ed09f2963c1512c3d72.zip FreeBSD-src-b1ece437b7748621dda38ed09f2963c1512c3d72.tar.gz | |
MFC r270038:
Complete r254667, do not destroy pmap lock if KVA allocation failed.
| -rw-r--r-- | sys/i386/i386/pmap.c | 4 | ||||
| -rw-r--r-- | sys/i386/xen/pmap.c | 1 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/pmap.c | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index e191d3a..0336295 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1755,10 +1755,8 @@ pmap_pinit(pmap_t pmap) */ if (pmap->pm_pdir == NULL) { pmap->pm_pdir = (pd_entry_t *)kva_alloc(NBPTD); - if (pmap->pm_pdir == NULL) { - PMAP_LOCK_DESTROY(pmap); + if (pmap->pm_pdir == NULL) return (0); - } #ifdef PAE pmap->pm_pdpt = uma_zalloc(pdptzone, M_WAITOK | M_ZERO); KASSERT(((vm_offset_t)pmap->pm_pdpt & diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index fb7781d..1ed2c03 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -1459,7 +1459,6 @@ pmap_pinit(pmap_t pmap) if (pmap->pm_pdir == NULL) { pmap->pm_pdir = (pd_entry_t *)kva_alloc(NBPTD); if (pmap->pm_pdir == NULL) { - PMAP_LOCK_DESTROY(pmap); #ifdef HAMFISTED_LOCKING mtx_unlock(&createdelete_lock); #endif diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c index c11e741..54e0b22 100644 --- a/sys/sparc64/sparc64/pmap.c +++ b/sys/sparc64/sparc64/pmap.c @@ -1209,11 +1209,9 @@ pmap_pinit(pmap_t pm) */ if (pm->pm_tsb == NULL) { pm->pm_tsb = (struct tte *)kva_alloc(TSB_BSIZE); - if (pm->pm_tsb == NULL) { - PMAP_LOCK_DESTROY(pm); + if (pm->pm_tsb == NULL) return (0); } - } /* * Allocate an object for it. |
