svn commit: r282696 - head/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Sat May  9 21:36:44 2015
New Revision: 282696
URL: https://svnweb.freebsd.org/changeset/base/282696

Log:
  Correct the assertion.  We should compare the pmap' curcpu pcid value
  against 0, not the pmap.
  
  Noted by:	Oliver Pinter <oliver.pinter at hardenedbsd.org>
  Sponsored by:	The FreeBSD Foundation
  MFC after:	3 weeks

Modified:
  head/sys/amd64/amd64/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Sat May  9 21:28:06 2015	(r282695)
+++ head/sys/amd64/amd64/pmap.c	Sat May  9 21:36:44 2015	(r282696)
@@ -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) {