diff options
Diffstat (limited to 'usr/src/uts/sfmmu')
| -rw-r--r-- | usr/src/uts/sfmmu/vm/hat_sfmmu.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/usr/src/uts/sfmmu/vm/hat_sfmmu.c b/usr/src/uts/sfmmu/vm/hat_sfmmu.c index 3a290b1fd7..1f0ef11096 100644 --- a/usr/src/uts/sfmmu/vm/hat_sfmmu.c +++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.c @@ -4411,10 +4411,11 @@ rehash: if (flags & HAC_PAGELOCK) { if (!page_trylock(pp, SE_SHARED)) { /* - * Somebody is holding SE_EXCL lock. Might - * even be hat_page_relocate(). Drop all - * our locks, lookup the page in &kvp, and - * retry. If it doesn't exist in &kvp and &zvp, + * Somebody is holding SE_EXCL lock. Might even be + * hat_page_relocate(). + * Drop all our locks, lookup the page in &kvp, and + * retry. + * If it doesn't exist in &kvp and &kvps[KV_ZVP], * then we must be dealing with a kernel mapped * page which doesn't actually belong to * segkmem so we punt. @@ -4423,10 +4424,10 @@ rehash: SFMMU_HASH_UNLOCK(hmebp); pp = page_lookup(&kvp, (u_offset_t)saddr, SE_SHARED); - /* check zvp before giving up */ + /* check &kvps[KV_ZVP] before giving up */ if (pp == NULL) - pp = page_lookup(&zvp, (u_offset_t)saddr, - SE_SHARED); + pp = page_lookup(&kvps[KV_ZVP], + (u_offset_t)saddr, SE_SHARED); /* Okay, we didn't find it, give up */ if (pp == NULL) { @@ -4590,10 +4591,11 @@ rehash: if (flags & HAC_PAGELOCK) { if (!page_trylock(pp, SE_SHARED)) { /* - * Somebody is holding SE_EXCL lock. Might - * even be hat_page_relocate(). Drop all - * our locks, lookup the page in &kvp, and - * retry. If it doesn't exist in &kvp and &zvp, + * Somebody is holding SE_EXCL lock. Might even be + * hat_page_relocate(). + * Drop all our locks, lookup the page in &kvp, and + * retry. + * If it doesn't exist in &kvp and &kvps[KV_ZVP], * then we must be dealing with a kernel mapped * page which doesn't actually belong to * segkmem so we punt. @@ -4601,10 +4603,11 @@ rehash: sfmmu_mlist_exit(pml); SFMMU_HASH_UNLOCK(hmebp); pp = page_lookup(&kvp, (u_offset_t)saddr, SE_SHARED); - /* check zvp before giving up */ + + /* check &kvps[KV_ZVP] before giving up */ if (pp == NULL) - pp = page_lookup(&zvp, (u_offset_t)saddr, - SE_SHARED); + pp = page_lookup(&kvps[KV_ZVP], + (u_offset_t)saddr, SE_SHARED); if (pp == NULL) { ASSERT(cookie == NULL); |