svn commit: r356122 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Fri Dec 27 13:37:19 2019
New Revision: 356122
URL: https://svnweb.freebsd.org/changeset/base/356122

Log:
  Plug a warning in read-mostly spinlocks reported by gcc.

Modified:
  head/sys/kern/kern_rmlock.c

Modified: head/sys/kern/kern_rmlock.c
==============================================================================
--- head/sys/kern/kern_rmlock.c	Fri Dec 27 11:26:12 2019	(r356121)
+++ head/sys/kern/kern_rmlock.c	Fri Dec 27 13:37:19 2019	(r356122)
@@ -1064,7 +1064,8 @@ rms_wlock(struct rmslock *rms)
 	mtx_lock(&rms->mtx);
 	rms->writers++;
 	if (rms->writers > 1) {
-		msleep(&rms->writers, &rms->mtx, PUSER - 1 | PDROP, mtx_name(&rms->mtx), 0);
+		msleep(&rms->writers, &rms->mtx, (PUSER - 1) | PDROP,
+		    mtx_name(&rms->mtx), 0);
 		MPASS(rms->readers == 0);
 		return;
 	}
@@ -1072,7 +1073,8 @@ rms_wlock(struct rmslock *rms)
 	rms_wlock_switch(rms);
 
 	if (rms->readers > 0)
-		msleep(&rms->writers, &rms->mtx, PUSER - 1 | PDROP, mtx_name(&rms->mtx), 0);
+		msleep(&rms->writers, &rms->mtx, (PUSER - 1) | PDROP,
+		    mtx_name(&rms->mtx), 0);
 	else
 		mtx_unlock(&rms->mtx);
 	MPASS(rms->readers == 0);