d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix logic error in the the assert, causing the condition to be always true.

Browse Source 
Also improve the formatting of the corresponding KASSERT message.

Based on the submission by:	Svyatoslav <razmyslov@viva64.com>
Found by:	PVS-Studio
PR:	217741
Reviewed by:	emaste
Sponsored by:	The FreeBSD Foundation (kib)
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2017-08-08 15:46:29 +00:00
parent 4312aa67e3
commit 16997138d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/hwpmc/hwpmc_piv.c
View File

@ -809,8 +809,8 @@ p4_config_pmc(int cpu, int ri, struct pmc *pm)
mtx_lock_spin(&pc->pc_mtx);
cfgflags = P4_PCPU_GET_CFGFLAGS(pc,ri);
KASSERT(cfgflags >= 0 || cfgflags <= 3,
("[p4,%d] illegal cfgflags cfg=%d on cpu=%d ri=%d", __LINE__,
KASSERT((cfgflags & ~0x3) == 0,
("[p4,%d] illegal cfgflags cfg=%#x on cpu=%d ri=%d", __LINE__,
cfgflags, cpu, ri));
KASSERT(cfgflags == 0 || phw->phw_pmc,
@ -835,8 +835,8 @@ p4_config_pmc(int cpu, int ri, struct pmc *pm)
phw->phw_pmc = NULL;
}
KASSERT(cfgflags >= 0 || cfgflags <= 3,
("[p4,%d] illegal runcount cfg=%d on cpu=%d ri=%d", __LINE__,
KASSERT((cfgflags & ~0x3) == 0,
("[p4,%d] illegal runcount cfg=%#x on cpu=%d ri=%d", __LINE__,
cfgflags, cpu, ri));
P4_PCPU_SET_CFGFLAGS(pc,ri,cfgflags);