Date: Sat, 20 Jan 2018 18:50:09 +0100 From: "O. Hartmann" <ohartmann@walstatt.org> To: Konstantin Belousov <kib@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r328202 - head/sys/amd64/amd64 Message-ID: <20180120185036.56380a83@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201801201746.w0KHk9x8032221@repo.freebsd.org> References: <201801201746.w0KHk9x8032221@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Am Sat, 20 Jan 2018 17:46:09 +0000 (UTC) Konstantin Belousov <kib@FreeBSD.org> schrieb: > 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-unsubscribe@freebsd.org" This commit breaks buildkernel: [...] /usr/src/sys/amd64/amd64/trap.c:710:33: error: use of undeclared identifier 'PMAP_PCID_MASK' (curpcb->pcb_saved_ucr3 & ~PMAP_PCID_MASK)== ^ /usr/src/sys/amd64/amd64/trap.c:711:36: error: use of undeclared identifier 'PMAP_PCID_MASK' (PCPU_GET(curpmap)->pm_cr3 & ~PMAP_PCID_MASK)) ^ 2 errors generated. --- modules-all --- --- all_subdir_ath_rate --- ===> ath_rate (all) --- all_subdir_ata --- --- all_subdir_ata/atapci/chipsets/atanational --- ===> ata/atapci/chipsets/atanational (all) --- trap.o --- *** [trap.o] Error code 1 -- O. Hartmann Ich widerspreche der Nutzung oder Übermittlung meiner Daten für Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG). [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWmOBbAAKCRDS528fyFhY lGKjAfwPO9zksOKvaT16wlRNfAEKpq/ak/ofnS2o4wfjDrP6w7DMWk2fhS9m8+DU NlTa5oAzW7NhbAFYQzTSOr2CN/8DAgCIbAapS4wlPgM8upgucv7TYu5Pe2dxB+Nn A7PoJlBkWWL1qqrIr/ckrbbu7fF5rlduvo6zXvnhvVjEHOyMtSu1 =+gKF -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180120185036.56380a83>