From owner-svn-src-all@freebsd.org Sat Jan 20 17:50:49 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0880EBC559; Sat, 20 Jan 2018 17:50:49 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42C7E83C96; Sat, 20 Jan 2018 17:50:48 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from thor.intern.walstatt.dynvpn.de ([92.227.32.169]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0Ln8Tl-1fJTAp1RHR-00hPCw; Sat, 20 Jan 2018 18:50:46 +0100 Date: Sat, 20 Jan 2018 18:50:09 +0100 From: "O. Hartmann" To: Konstantin Belousov 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> Organization: WALSTATT User-Agent: OutScare 3.1415926 X-Operating-System: ImNotAnOperatingSystem 3.141592527 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/QW4TPOqUrhxtd=WE+5Ydlo2"; protocol="application/pgp-signature" X-Provags-ID: V03:K0:dNzK7enb5c342MSJynlWgXP3ZMhhqKX1ai5kKZx8tD/yTk3TUc2 NUT0NV4+PBPJZCvKALEiiaatPwxAatchC4n3+VHretqA/4+/3valnYeXgrfDAQvDbek771d m12sdIjWo83sUhQtjBbIFD1DnnRuVnJ/JxYUkRjbj2osHYJWsUn+tRCU1YbwFZFnOJlygR0 vFD/fZMY+TUZ3tAJVqm3Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:EslQgLzn7sY=:VAcn76gms/dQz3PILOWgj/ RiJpzPd+ufdLH33BoQgKzDP5q/IFwc0mcZFRQYPr++A0zChKAZ3yI78+sTmnjOrFZgMtmDDT4 dk5k00Mq48KUCRPJ27mc+Q47x/zLFTZ6y26QP2CSEliNEuELzQZBSYuCCp8ssx38knGoDNnUE wg9n8KyZ9aDZoxGwPaNJ4HcTXQ/mrUKUu84yK+VABSLsoiQAgMDW6gYUVINAzkTFdknKAI06O /yNbhPx/JG1zTZRwfGy7Yh0QEtmep4SKp3R6o9HN6jeeuijG5mIeERj/ekkORFO+dIPW5RFst MfNjtzF793B+Zlzx9itxYxeGS6dLGp9eb+d3zmTlQ+DYbrcaYBNvK86k1LhX/Bk4P8OqR5ODp C4c2aXBIm5d7wu4apDtNlO0B3YHCBYR0iq0pYh2E4AxUqxWbl/UtdLOXU02AjNJZPLxXz2WB9 MyRdHA5AtqPN2C/T9edGSkXAOdqcQOS/isRY35J5nZKIqiG6OW2+NlHiz/C5ZSkv2wtVoq8nt XC3QPj9Y6jf0TpoEuzBb1zKje3hGwwj0wUTwCDnl9WEhcltR2OVqiaM8npPdV8l8iSisQT+Sz E8iwNcGAXL+jyKFu75hDZ+aEoHHijBUADQ0QAYnwlnT+tOrWoTfKGDlDSEtYARz0tPUHPqgfd Ba5hHewh6q6KmTbPgnGvSfyscD0T9PXz2OUyQSFKFOaxSAC+F5+2NmvfVqUyrEQ4uPpkFPeF+ ZGt+b/soz/p1iQk89Hxq84NFbjvRLrrlRN/vwdWNXMnnKla7mrmfAPeIA6fevphUhsXbFfpyi tYCbNogusEARZPH0LFvPdYhJTQAGQ== X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jan 2018 17:50:49 -0000 --Sig_/QW4TPOqUrhxtd=WE+5Ydlo2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Sat, 20 Jan 2018 17:46:09 +0000 (UTC) Konstantin Belousov schrieb: > Author: kib > Date: Sat Jan 20 17:46:09 2018 > New Revision: 328202 > URL: https://svnweb.freebsd.org/changeset/base/328202 >=20 > Log: > Use predefined symbol for the CR3.PCID mask. > =20 > Sponsored by: The FreeBSD Foundation > MFC after: 11 days >=20 > Modified: > head/sys/amd64/amd64/trap.c >=20 > Modified: head/sys/amd64/amd64/trap.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 !=3D 0 && (frame->tf_err & (PGEX_P | PGEX_= W | > PGEX_U | PGEX_I)) =3D=3D (PGEX_P | PGEX_U | PGEX_I) && > - (curpcb->pcb_saved_ucr3 & ~(PMAP_PCID_OVERMAX - 1))=3D=3D > - (PCPU_GET(curpmap)->pm_cr3 & ~(PMAP_PCID_OVERMAX - 1))) > + (curpcb->pcb_saved_ucr3 & ~PMAP_PCID_MASK)=3D=3D > + (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); > =20 > _______________________________________________ > 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)=3D=3D ^ /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 --- =3D=3D=3D> ath_rate (all) --- all_subdir_ata --- --- all_subdir_ata/atapci/chipsets/atanational --- =3D=3D=3D> ata/atapci/chipsets/atanational (all) --- trap.o --- *** [trap.o] Error code 1 --=20 O. Hartmann Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Abs.= 4 BDSG). --Sig_/QW4TPOqUrhxtd=WE+5Ydlo2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWmOBbAAKCRDS528fyFhY lGKjAfwPO9zksOKvaT16wlRNfAEKpq/ak/ofnS2o4wfjDrP6w7DMWk2fhS9m8+DU NlTa5oAzW7NhbAFYQzTSOr2CN/8DAgCIbAapS4wlPgM8upgucv7TYu5Pe2dxB+Nn A7PoJlBkWWL1qqrIr/ckrbbu7fF5rlduvo6zXvnhvVjEHOyMtSu1 =+gKF -----END PGP SIGNATURE----- --Sig_/QW4TPOqUrhxtd=WE+5Ydlo2--