summaryrefslogtreecommitdiff
path: root/usr/src/uts
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-05-11 17:48:44 +0300
committerToomas Soome <tsoome@me.com>2020-05-15 10:57:18 +0300
commit4a6e21349395bc68ce9ec2839d99f74b079861b5 (patch)
tree8dbfb50d7f6c03978774a92e4e9e6f356973d6bc /usr/src/uts
parent97f11506b8e20d03ac8f60ff1b6c7e38a3326df3 (diff)
downloadillumos-joyent-4a6e21349395bc68ce9ec2839d99f74b079861b5.tar.gz
12727 unix: 'zvp' is undeclared
Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: John Levon <john.levon@joyent.com> Reviewed by: Patrick Mooney <pmooney@pfmooney.com> Approved by: Joshua M. Clulow <josh@sysmgr.org>
Diffstat (limited to 'usr/src/uts')
-rw-r--r--usr/src/uts/sfmmu/vm/hat_sfmmu.c31
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 2c6f5fb87f..76617cb130 100644
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.c
+++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.c
@@ -4408,10 +4408,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.
@@ -4420,10 +4421,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) {
@@ -4587,10 +4588,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.
@@ -4598,10 +4600,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);