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

[O. Hartmann]

Am Sat, 20 Jan 2018 17:46:09 +0000 (UTC)
Konstantin Belousov <kib at 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 at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at 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).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 313 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20180120/7d018b01/attachment-0001.sig>