diff options
| author | mjacob <mjacob@FreeBSD.org> | 2001-07-11 02:23:31 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2001-07-11 02:23:31 +0000 |
| commit | a896ae072f0bc9e5b8eda9413da3d760bb3d8395 (patch) | |
| tree | cd7bd0e3b4972d76b195b761807ddafb586b3070 /sys | |
| parent | 9a7a96328cf4facedfd68ed99266d9014022f9c8 (diff) | |
| download | FreeBSD-src-a896ae072f0bc9e5b8eda9413da3d760bb3d8395.zip FreeBSD-src-a896ae072f0bc9e5b8eda9413da3d760bb3d8395.tar.gz | |
Slight cleanliness- add an unlock of Giant in one dopanic case. Do
some very minor formatting changes.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/alpha/alpha/trap.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index f2154f7..27ca15c 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -421,7 +421,6 @@ trap(a0, a1, a2, entry, framep) } alpha_fpstate_switch(p); - goto out; default: @@ -510,6 +509,7 @@ trap(a0, a1, a2, entry, framep) break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ + mtx_unlock(&Giant); goto dopanic; #endif } @@ -562,12 +562,12 @@ trap(a0, a1, a2, entry, framep) * we need to reflect that as an access error. */ if (map != kernel_map && - (caddr_t)va >= vm->vm_maxsaddr - && (caddr_t)va < (caddr_t)USRSTACK) { + (caddr_t)va >= vm->vm_maxsaddr && + (caddr_t)va < (caddr_t)USRSTACK) { if (rv == KERN_SUCCESS) { - unsigned nss; - - nss = alpha_btop(round_page(USRSTACK - va)); + unsigned long nss, rp; + rp = round_page(USRSTACK - va); + nss = alpha_btop(rp); if (nss > vm->vm_ssize) vm->vm_ssize = nss; } else if (rv == KERN_PROTECTION_FAILURE) @@ -626,13 +626,10 @@ out: dopanic: printtrap(a0, a1, a2, entry, framep, 1, user); - /* XXX dump registers */ - #ifdef DDB kdb_trap(a0, a1, a2, entry, framep); #endif - panic("trap"); } |
