diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2015-05-09 21:36:44 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2015-05-09 21:36:44 +0000 |
| commit | b40a715c117ce6ebba8b73ef1671ec4563daee49 (patch) | |
| tree | 334120ca6af4fe8015c295a7fd41490aa37ffa56 /sys/amd64 | |
| parent | 532248e092a694e96f2e40c6fec3154f1dd0a8bf (diff) | |
| download | src-b40a715c117ce6ebba8b73ef1671ec4563daee49.tar.gz src-b40a715c117ce6ebba8b73ef1671ec4563daee49.zip | |
Correct the assertion. We should compare the pmap' curcpu pcid value
against 0, not the pmap.
Noted by: Oliver Pinter <oliver.pinter@hardenedbsd.org>
Sponsored by: The FreeBSD Foundation
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=282696
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index e18676af80f7..916c09d5cf6e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6602,7 +6602,8 @@ pmap_activate_sw(struct thread *td) pmap->pm_pcids[cpuid].pm_pcid < PMAP_PCID_OVERMAX, ("pmap %p cpu %d pcid %#x", pmap, cpuid, pmap->pm_pcids[cpuid].pm_pcid)); - KASSERT(pmap != PMAP_PCID_KERN || pmap == kernel_pmap, + KASSERT(pmap->pm_pcids[cpuid].pm_pcid != PMAP_PCID_KERN || + pmap == kernel_pmap, ("non-kernel pmap %p cpu %d pcid %#x", pmap, cpuid, pmap->pm_pcids[cpuid].pm_pcid)); if (!cached || (cr3 & ~CR3_PCID_MASK) != pmap->pm_cr3) { |