Author: kib
Date: Sat Jan 20 17:46:09 2018
New Revision: 328202
URL: https://svnweb.freebsd.org/changeset/base/328202

Log:
  Use predefined symbol for the CR3.PCID mask.
  
  Sponsored by: The FreeBSD Foundation
  MFC after:    11 days

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

Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c Sat Jan 20 17:02:17 2018        (r328201)
+++ head/sys/amd64/amd64/trap.c Sat Jan 20 17:46:09 2018        (r328202)
@@ -707,8 +707,8 @@ trap_pfault(struct trapframe *frame, int usermode)
         */
        if (pti && usermode && pg_nx != 0 && (frame->tf_err & (PGEX_P | PGEX_W |
            PGEX_U | PGEX_I)) == (PGEX_P | PGEX_U | PGEX_I) &&
-           (curpcb->pcb_saved_ucr3 & ~(PMAP_PCID_OVERMAX - 1))==
-           (PCPU_GET(curpmap)->pm_cr3 & ~(PMAP_PCID_OVERMAX - 1)))
+           (curpcb->pcb_saved_ucr3 & ~PMAP_PCID_MASK)==
+           (PCPU_GET(curpmap)->pm_cr3 & ~PMAP_PCID_MASK))
                panic("PTI: pid %d comm %s tf_err %#lx\n", p->p_pid,
                    p->p_comm, frame->tf_err);
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to