 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpufunc.S,v 1.62 2020/06/15 20:27:30 riastradh Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.63 2020/06/24 18:09:37 maxv Exp $	*/
 /*
  * Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -436,29 +436,20 @@ ENTRY(outw)
 	movq	%rdi, %rdx
 	movq	%rsi, %rax
 	outw	%ax, %dx
 	ret
 END(outw)
 ENTRY(outl)
 	movq	%rdi, %rdx
 	movq	%rsi, %rax
 	outl	%eax, %dx
 	ret
 END(outl)
 ENTRY(x86_stos)
 	movq	%rsi,%rax
 	movq	%rdx,%rcx
 	KMSAN_REP_STOS(8)
 	rep
 	stosq
 	ret
 END(x86_stos)
 ENTRY(x86_movs)
 	movq	%rdx,%rcx
 	KMSAN_REP_STOS(8)
 	rep
 	movsq
 	ret
 END(x86_movs)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpufunc.S,v 1.47 2020/06/15 09:09:23 msaitoh Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.48 2020/06/24 18:09:37 maxv Exp $	*/
 /*-
  * Copyright (c) 1998, 2007, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Functions to provide access to i386-specific instructions.
+ *
  * These are shared with NetBSD/xen.
  */
 #include <sys/errno.h>
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.47 2020/06/15 09:09:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.48 2020/06/24 18:09:37 maxv Exp $");
 #include "opt_xen.h"
 #include <machine/specialreg.h>
 #include <machine/segments.h>
 #include "assym.h"
 ENTRY(x86_lfence)
 	lock
 	addl	$0, -4(%esp)
 	ret
 END(x86_lfence)
 @@ -344,42 +344,26 @@ ENTRY(outw)
 	movl	4(%esp), %edx
 	movl	8(%esp), %eax
 	outw	%ax, %dx
 	ret
 END(outw)
 ENTRY(outl)
 	movl	4(%esp), %edx
 	movl	8(%esp), %eax
 	outl	%eax, %dx
 	ret
 END(outl)
 ENTRY(x86_stos)
 	pushl	%ebp
 	movl	%esp,%ebp
 	pushl	%edi
 	pushl	%esi
 	movl	8(%ebp),%edi
 	movl	12(%ebp),%eax
 	movl	16(%ebp),%ecx
 	rep
 	stosl
 	popl	%esi
 	popl	%edi
 	leave
 	ret
 END(x86_stos)
 ENTRY(x86_movs)
 	pushl	%ebp
 	movl	%esp,%ebp
 	pushl	%edi
 	pushl	%esi
 	movl	8(%ebp),%edi
 	movl	12(%ebp),%esi
 	movl	16(%ebp),%ecx
 	rep
 	movsl
 	popl	%esi
 	popl	%edi
 	leave

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.122 2020/05/27 19:33:40 ad Exp $	*/
+/*	$NetBSD: pmap.h,v 1.123 2020/06/24 18:09:37 maxv Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -602,19 +602,18 @@ extern vaddr_t pmap_direct_end;
 #define PMAP_DIRECT_END		pmap_direct_end
 #define PMAP_DIRECT_MAP(pa)	((vaddr_t)PMAP_DIRECT_BASE + (pa))
 #define PMAP_DIRECT_UNMAP(va)	((paddr_t)(va) - PMAP_DIRECT_BASE)
 /*
  * Alternate mapping hooks for pool pages.
  */
 #define PMAP_MAP_POOLPAGE(pa)	PMAP_DIRECT_MAP((pa))
 #define PMAP_UNMAP_POOLPAGE(va)	PMAP_DIRECT_UNMAP((va))
 #endif /* __HAVE_DIRECT_MAP */
 void	x86_stos(void *, long, long);
 void	x86_movs(void *, void *, long);
 #endif /* _KERNEL */
 #endif /* _X86_PMAP_H_ */