date:20181222

CVS commit: src/bin/cp

2018-12-22 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Sun Dec 23 01:29:23 UTC 2018

Modified Files:
src/bin/cp: cp.1

Log Message:
Clarify a sentence about the error handling of cp(1)'s -p option.
Addresses PR bin/40336.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/bin/cp/cp.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/cp/cp.1
diff -u src/bin/cp/cp.1:1.45 src/bin/cp/cp.1:1.46
--- src/bin/cp/cp.1:1.45	Thu Aug 11 00:17:23 2016
+++ src/bin/cp/cp.1	Sun Dec 23 01:29:23 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cp.1,v 1.45 2016/08/11 00:17:23 sevan Exp $
+.\"	$NetBSD: cp.1,v 1.46 2018/12/23 01:29:23 gutteridge Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd August 11, 2016
+.Dd December 22, 2018
 .Dt CP 1
 .Os
 .Sh NAME
@@ -120,8 +120,9 @@ to preserve in the copy as many of the m
 file flags, file mode, user ID, group ID, and extended attributes,
 as allowed by permissions.
 .Pp
-If the user ID and group ID cannot be preserved, no error message
-is displayed and the exit value is not altered.
+If the user ID and group ID cannot be preserved due to insufficient
+permissions, no error message is displayed and the exit value is not
+altered.
 .Pp
 If the source file has its set user ID bit on and the user ID cannot
 be preserved, the set user ID bit is not preserved

CVS commit: src/doc

2018-12-22 Thread Sevan Janiyan

Module Name:src
Committed By:   sevan
Date:   Sun Dec 23 01:24:54 UTC 2018

Modified Files:
src/doc: 3RDPARTY

Log Message:
Bump dtc & dts versions available upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1577 -r1.1578 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1577 src/doc/3RDPARTY:1.1578
--- src/doc/3RDPARTY:1.1577	Wed Dec 19 22:22:16 2018
+++ src/doc/3RDPARTY	Sun Dec 23 01:24:54 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1577 2018/12/19 22:22:16 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1578 2018/12/23 01:24:54 sevan Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1704,7 +1704,7 @@ Notes:
 
 Package:	dtc,libfdt
 Version:	1.4.4
-Current Vers:	1.4.6
+Current Vers:	1.4.7
 Maintainer:	David Gibson , Jon Loeliger 
 Archive Site:	https://git.kernel.org/pub/scm/utils/dtc/dtc.git
 Home Page:	https://git.kernel.org/pub/scm/utils/dtc/dtc.git
@@ -1717,7 +1717,7 @@ external/gpl2/dtc/dtc2netbsd should be u
 
 Package:	dts
 Version:	4.18-rc2
-Current Vers:	4.18
+Current Vers:	4.19
 Maintainer:	https://www.kernel.org/
 Archive Site:	https://cdn.kernel.org/pub/linux/kernel/v4.x/
 Home Page:	https://www.kernel.org/

CVS commit: src/sys/kern

2018-12-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Dec 22 21:53:06 UTC 2018

Modified Files:
src/sys/kern: subr_thmap.c

Log Message:
add missing quotes 7


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_thmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/subr_thmap.c
diff -u src/sys/kern/subr_thmap.c:1.2 src/sys/kern/subr_thmap.c:1.3
--- src/sys/kern/subr_thmap.c:1.2	Sat Dec 22 15:49:04 2018
+++ src/sys/kern/subr_thmap.c	Sat Dec 22 16:53:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_thmap.c,v 1.2 2018/12/22 20:49:04 christos Exp $	*/
+/*	$NetBSD: subr_thmap.c,v 1.3 2018/12/22 21:53:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 2018 Mindaugas Rasiukevicius 
@@ -112,7 +112,7 @@
 #include "utils.h"
 #endif
 
-THMAP_RCSID($NetBSD: subr_thmap.c,v 1.2 2018/12/22 20:49:04 christos Exp $);
+THMAP_RCSID("$NetBSD: subr_thmap.c,v 1.3 2018/12/22 21:53:06 christos Exp $");
 
 /*
  * NetBSD kernel wrappers

CVS commit: src/sys/arch

2018-12-22 Thread Cherry G. Mathew

Module Name:src
Committed By:   cherry
Date:   Sat Dec 22 21:27:22 UTC 2018

Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S i386func.S
src/sys/arch/xen/x86: xenfunc.c

Log Message:
Introduce a weak alias method of exporting different implementations
of the same API.

For eg: the amd64 native implementation of invlpg() now becomes
amd64_invlpg() with a weak symbol export of invlpg(), while the XEN
implementation becomes xen_invlpg(), also weakly exported as invlpg()

Note that linking in both together without having an override function
named invlpg() would be a mistake, as we have limited control over
which of the two options would emerge as the finally exported invlpg()
resulting in a potential situation where the wrong function is finally
exported. This change avoids this situation.

We should however include an override function invlpg() in that case,
such that it is able to then pass on the call to the appropriate
backing function (amd64_invlpg() in the case of native, and
xen_invlpg() in the case of under XEN virtualisation) at runtime.

This change does not introduce such a function and therefore does not
alter builds to include native as well as XEN implementations in the
same binary. This will be done later, with the introduction of XEN
PVHVM mode, where precisely such a runtime switch is required.

There are no operational changes introduced by this change.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/cpufunc.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/i386/i386func.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/x86/xenfunc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.33 src/sys/arch/amd64/amd64/cpufunc.S:1.34
--- src/sys/arch/amd64/amd64/cpufunc.S:1.33	Sat Jul 21 06:09:13 2018
+++ src/sys/arch/amd64/amd64/cpufunc.S	Sat Dec 22 21:27:22 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.S,v 1.33 2018/07/21 06:09:13 maxv Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.34 2018/12/22 21:27:22 cherry Exp $	*/
 
 /*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -63,18 +63,53 @@ ENTRY(x86_mfence)
 	ret
 END(x86_mfence)
 
+/*
+ * These functions below should always be accessed via the corresponding wrapper
+ * function names defined in x86/include/cpufunc.h and exported as WEAK_ALIAS()
+ *
+ * We use this rather roundabout method so that a runtime wrapper function may
+ * be made available for PVHVM, which could override both native and PV aliases
+ * and decide which to invoke at run time.
+ */
+
+WEAK_ALIAS(invlpg, amd64_invlpg)
+WEAK_ALIAS(lidt, amd64_lidt)
+WEAK_ALIAS(lldt, amd64_lldt)
+WEAK_ALIAS(ltr, amd64_ltr)
+WEAK_ALIAS(lcr0, amd64_lcr0)
+WEAK_ALIAS(rcr0, amd64_rcr0)
+WEAK_ALIAS(rcr2, amd64_rcr2)
+WEAK_ALIAS(lcr2, amd64_lcr2)
+WEAK_ALIAS(rcr3, amd64_rcr3)
+WEAK_ALIAS(lcr3, amd64_lcr3)
+WEAK_ALIAS(tlbflush, amd64_tlbflush)
+WEAK_ALIAS(tlbflushg, amd64_tlbflushg)
+WEAK_ALIAS(rdr0, amd64_rdr0)
+WEAK_ALIAS(ldr0, amd64_ldr0)
+WEAK_ALIAS(rdr1, amd64_rdr1)
+WEAK_ALIAS(ldr1, amd64_ldr1)
+WEAK_ALIAS(rdr2, amd64_rdr2)
+WEAK_ALIAS(ldr2, amd64_ldr2)
+WEAK_ALIAS(rdr3, amd64_rdr3)
+WEAK_ALIAS(ldr3, amd64_ldr3)
+WEAK_ALIAS(rdr6, amd64_rdr6)
+WEAK_ALIAS(ldr6, amd64_ldr6)
+WEAK_ALIAS(rdr7, amd64_rdr7)
+WEAK_ALIAS(ldr7, amd64_ldr7)
+WEAK_ALIAS(wbinvd, amd64_wbinvd)
+
 #ifndef XEN
-ENTRY(invlpg)
+ENTRY(amd64_invlpg)
 	invlpg	(%rdi)
 	ret
-END(invlpg)
+END(amd64_invlpg)
 
-ENTRY(lidt)
+ENTRY(amd64_lidt)
 	lidt	(%rdi)
 	ret
-END(lidt)
+END(amd64_lidt)
 
-ENTRY(lldt)
+ENTRY(amd64_lldt)
 	cmpl	%edi, CPUVAR(CURLDT)
 	jne	1f
 	ret
@@ -82,42 +117,42 @@ ENTRY(lldt)
 	movl	%edi, CPUVAR(CURLDT)
 	lldt	%di
 	ret
-END(lldt)
+END(amd64_lldt)
 
-ENTRY(ltr)
+ENTRY(amd64_ltr)
 	ltr	%di
 	ret
-END(ltr)
+END(amd64_ltr)
 
-ENTRY(lcr0)
+ENTRY(amd64_lcr0)
 	movq	%rdi, %cr0
 	ret
-END(lcr0)
+END(amd64_lcr0)
 
-ENTRY(rcr0)
+ENTRY(amd64_rcr0)
 	movq	%cr0, %rax
 	ret
-END(rcr0)
+END(amd64_rcr0)
 
-ENTRY(lcr2)
+ENTRY(amd64_lcr2)
 	movq	%rdi, %cr2
 	ret
-END(lcr2)
+END(amd64_lcr2)
 
-ENTRY(rcr2)
+ENTRY(amd64_rcr2)
 	movq	%cr2, %rax
 	ret
-END(rcr2)
+END(amd64_rcr2)
 
-ENTRY(lcr3)
+ENTRY(amd64_lcr3)
 	movq	%rdi, %cr3
 	ret
-END(lcr3)
+END(amd64_lcr3)
 
-ENTRY(rcr3)
+ENTRY(amd64_rcr3)
 	movq	%cr3, %rax
 	ret
-END(rcr3)
+END(amd64_rcr3)
 #endif
 
 ENTRY(lcr4)
@@ -159,7 +194,7 @@ END(rcr8)
  * If PGE is not in use, we reload CR3.
  */
 #ifndef XEN
-ENTRY(tlbflushg)
+ENTRY(amd64_tlbflushg)
 	movq	%cr4, %rax
 	testq	$CR4_PGE, %rax
 	jz	1f
@@ -168,74 +203,74 @@ ENTRY(tlbflushg)
 	movq	%rdx, %cr4
 	movq	%rax, %cr4
 	ret
-END(tlbflushg)
+END(amd64_tlbflushg)
 
-ENTRY(tlbflush)
+ENTRY(amd64_tlbflush)
 1:
 	movq	%cr3, %rax
 	movq	%rax, %cr3
 	ret
-END(tlbflush)
+END(amd64_tlbflush)
 
-ENTRY(ldr0)

CVS commit: src/sys/dev/pci

2018-12-22 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Sat Dec 22 20:57:44 UTC 2018

Modified Files:
src/sys/dev/pci: if_ena.c

Log Message:
remove needless parens, makes clang happy


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_ena.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.11 src/sys/dev/pci/if_ena.c:1.12
--- src/sys/dev/pci/if_ena.c:1.11	Fri Nov 30 14:07:30 2018
+++ src/sys/dev/pci/if_ena.c	Sat Dec 22 20:57:44 2018
@@ -31,7 +31,7 @@
 #if 0
 __FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.11 2018/11/30 14:07:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.12 2018/12/22 20:57:44 roy Exp $");
 
 #include 
 #include 
@@ -1595,7 +1595,7 @@ ena_rx_checksum(struct ena_ring *rx_ring
 {
 
 	/* IPv4 */
-	if ((ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4)) {
+	if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4) {
 		mbuf->m_pkthdr.csum_flags |= M_CSUM_IPv4;
 		if (ena_rx_ctx->l3_csum_err) {
 			/* ipv4 checksum error */
@@ -1618,7 +1618,7 @@ ena_rx_checksum(struct ena_ring *rx_ring
 		}
 	}
 	/* IPv6 */
-	else if ((ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6)) {
+	else if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6) {
 		/*  TCP/UDP */
 		if ((ena_rx_ctx->l4_proto == ENA_ETH_IO_L4_PROTO_TCP) ||
 		(ena_rx_ctx->l4_proto == ENA_ETH_IO_L4_PROTO_UDP)) {

CVS commit: src/sys/kern

2018-12-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Dec 22 20:49:04 UTC 2018

Modified Files:
src/sys/kern: subr_thmap.c

Log Message:
- add rcsid
- don't define DEBUG
- protect function used in KASSERT with DIAGNOSTIC not DEBUG


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_thmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/subr_thmap.c
diff -u src/sys/kern/subr_thmap.c:1.1 src/sys/kern/subr_thmap.c:1.2
--- src/sys/kern/subr_thmap.c:1.1	Sun Dec 16 09:06:56 2018
+++ src/sys/kern/subr_thmap.c	Sat Dec 22 15:49:04 2018
@@ -1,3 +1,5 @@
+/*	$NetBSD: subr_thmap.c,v 1.2 2018/12/22 20:49:04 christos Exp $	*/
+
 /*-
  * Copyright (c) 2018 Mindaugas Rasiukevicius 
  * All rights reserved.
@@ -85,6 +87,7 @@
  *	https://www.csd.uoc.gr/~hy460/pdf/p650-lehman.pdf
  */
 
+
 #ifdef _KERNEL
 #include 
 #include 
@@ -94,6 +97,7 @@
 #include 
 #include 
 #include 
+#define THMAP_RCSID(a) __KERNEL_RCSID(0, a)
 #else
 #include 
 #include 
@@ -102,17 +106,19 @@
 #include 
 #include 
 #include 
+#define THMAP_RCSID(a) __RCSID(a)
 
 #include "thmap.h"
 #include "utils.h"
 #endif
 
+THMAP_RCSID($NetBSD: subr_thmap.c,v 1.2 2018/12/22 20:49:04 christos Exp $);
+
 /*
  * NetBSD kernel wrappers
  */
 #ifdef _KERNEL
 #define	ASSERT KASSERT
-#define	DEBUG 1
 #define	atomic_thread_fence(x) x
 #define	memory_order_stores membar_producer()
 #define	memory_order_loads membar_consumer()
@@ -245,7 +251,7 @@ static const thmap_ops_t thmap_default_o
  * NODE LOCKING.
  */
 
-#ifdef DEBUG
+#ifdef DIAGNOSTIC
 static inline bool
 node_locked_p(const thmap_inode_t *node)
 {

CVS commit: src/sys/kern

2018-12-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Dec 22 20:49:19 UTC 2018

Modified Files:
src/sys/kern: subr_syscall_stats.c

Log Message:
use the proper rcsid for the kernel


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/subr_syscall_stats.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/subr_syscall_stats.c
diff -u src/sys/kern/subr_syscall_stats.c:1.3 src/sys/kern/subr_syscall_stats.c:1.4
--- src/sys/kern/subr_syscall_stats.c:1.3	Tue Feb 25 13:30:11 2014
+++ src/sys/kern/subr_syscall_stats.c	Sat Dec 22 15:49:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_syscall_stats.c,v 1.3 2014/02/25 18:30:11 pooka Exp $	*/
+/*	$NetBSD: subr_syscall_stats.c,v 1.4 2018/12/22 20:49:19 christos Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: subr_syscall_stats.c,v 1.3 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_syscall_stats.c,v 1.4 2018/12/22 20:49:19 christos Exp $");
 
 #include "opt_syscall_stats.h"

CVS commit: src/sys/dev/usb

2018-12-22 Thread Rin Okuyama

Module Name:src
Committed By:   rin
Date:   Sat Dec 22 16:58:51 UTC 2018

Modified Files:
src/sys/dev/usb: if_mue.c

Log Message:
Fix previous; We also need to turn off IFF_ALLMULTI bit when
it is disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/if_mue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.24 src/sys/dev/usb/if_mue.c:1.25
--- src/sys/dev/usb/if_mue.c:1.24	Thu Dec 20 02:52:59 2018
+++ src/sys/dev/usb/if_mue.c	Sat Dec 22 16:58:51 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mue.c,v 1.24 2018/12/20 02:52:59 rin Exp $	*/
+/*	$NetBSD: if_mue.c,v 1.25 2018/12/22 16:58:51 rin Exp $	*/
 /*	$OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $	*/
 
 /*
@@ -20,7 +20,7 @@
 /* Driver for Microchip LAN7500/LAN7800 chipsets. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.24 2018/12/20 02:52:59 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.25 2018/12/22 16:58:51 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1330,11 +1330,11 @@ mue_setmulti(struct mue_softc *sc)
 	/* Always accept broadcast frames. */
 	rxfilt |= MUE_RFE_CTL_BROADCAST;
 
-	if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) {
-allmulti:	ifp->if_flags |= IFF_ALLMULTI;
-		rxfilt |= MUE_RFE_CTL_MULTICAST;
+	if (ifp->if_flags & IFF_PROMISC) {
+		rxfilt |= MUE_RFE_CTL_UNICAST;
+allmulti:	rxfilt |= MUE_RFE_CTL_MULTICAST;
+		ifp->if_flags |= IFF_ALLMULTI;
 		if (ifp->if_flags & IFF_PROMISC) {
-			rxfilt |= MUE_RFE_CTL_UNICAST;
 			DPRINTF(sc, "promisc\n");
 		} else {
 			DPRINTF(sc, "allmulti\n");
@@ -1369,6 +1369,7 @@ allmulti:	ifp->if_flags |= IFF_ALLMULTI;
 			ETHER_NEXT_MULTI(step, enm);
 		}
 		rxfilt |= MUE_RFE_CTL_PERFECT;
+		ifp->if_flags &= ~IFF_ALLMULTI;
 		if (rxfilt & MUE_RFE_CTL_MULTICAST_HASH) {
 			DPRINTF(sc, "perfect filter and hash tables\n");
 		} else {

CVS commit: src

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 14:39:47 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile mbuf.9

Log Message:
Update the man page, we don't want M_COPY_PKTHDR, M_MOVE_PKTHDR, MH_ALIGN
and M_ALIGN.


To generate a diff of this commit:
cvs rdiff -u -r1.2243 -r1.2244 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.432 -r1.433 src/share/man/man9/Makefile
cvs rdiff -u -r1.65 -r1.66 src/share/man/man9/mbuf.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2243 src/distrib/sets/lists/comp/mi:1.2244
--- src/distrib/sets/lists/comp/mi:1.2243	Wed Dec 19 22:19:25 2018
+++ src/distrib/sets/lists/comp/mi	Sat Dec 22 14:39:47 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2243 2018/12/19 22:19:25 christos Exp $
+#	$NetBSD: mi,v 1.2244 2018/12/22 14:39:47 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -10452,11 +10452,11 @@
 ./usr/share/man/cat9/MFREE.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/MGET.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/MGETHDR.0			comp-sys-catman		.cat
-./usr/share/man/cat9/MH_ALIGN.0			comp-sys-catman		.cat
-./usr/share/man/cat9/M_ALIGN.0			comp-sys-catman		.cat
-./usr/share/man/cat9/M_COPY_PKTHDR.0		comp-sys-catman		.cat
+./usr/share/man/cat9/MH_ALIGN.0			comp-obsolete		obsolete
+./usr/share/man/cat9/M_ALIGN.0			comp-obsolete		obsolete
+./usr/share/man/cat9/M_COPY_PKTHDR.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/M_LEADINGSPACE.0		comp-sys-catman		.cat
-./usr/share/man/cat9/M_MOVE_PKTHDR.0		comp-sys-catman		.cat
+./usr/share/man/cat9/M_MOVE_PKTHDR.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/M_PREPEND.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/M_TRAILINGSPACE.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/NDINIT.0			comp-sys-catman		.cat
@@ -18331,11 +18331,11 @@
 ./usr/share/man/html9/MFREE.html		comp-sys-htmlman	html
 ./usr/share/man/html9/MGET.html			comp-sys-htmlman	html
 ./usr/share/man/html9/MGETHDR.html		comp-sys-htmlman	html
-./usr/share/man/html9/MH_ALIGN.html		comp-sys-htmlman	html
-./usr/share/man/html9/M_ALIGN.html		comp-sys-htmlman	html
-./usr/share/man/html9/M_COPY_PKTHDR.html	comp-sys-htmlman	html
+./usr/share/man/html9/MH_ALIGN.html		comp-obsolete	obsolete
+./usr/share/man/html9/M_ALIGN.html		comp-obsolete	obsolete
+./usr/share/man/html9/M_COPY_PKTHDR.html	comp-obsolete	obsolete
 ./usr/share/man/html9/M_LEADINGSPACE.html	comp-sys-htmlman	html
-./usr/share/man/html9/M_MOVE_PKTHDR.html	comp-sys-htmlman	html
+./usr/share/man/html9/M_MOVE_PKTHDR.html	comp-obsolete		obsolete
 ./usr/share/man/html9/M_PREPEND.html		comp-sys-htmlman	html
 ./usr/share/man/html9/M_TRAILINGSPACE.html	comp-sys-htmlman	html
 ./usr/share/man/html9/NDINIT.html		comp-sys-htmlman	html
@@ -26292,11 +26292,11 @@
 ./usr/share/man/man9/MFREE.9			comp-sys-man		.man
 ./usr/share/man/man9/MGET.9			comp-sys-man		.man
 ./usr/share/man/man9/MGETHDR.9			comp-sys-man		.man
-./usr/share/man/man9/MH_ALIGN.9			comp-sys-man		.man
-./usr/share/man/man9/M_ALIGN.9			comp-sys-man		.man
-./usr/share/man/man9/M_COPY_PKTHDR.9		comp-sys-man		.man
+./usr/share/man/man9/MH_ALIGN.9			comp-obsolete		obsolete
+./usr/share/man/man9/M_ALIGN.9			comp-obsolete		obsolete
+./usr/share/man/man9/M_COPY_PKTHDR.9		comp-obsolete		obsolete
 ./usr/share/man/man9/M_LEADINGSPACE.9		comp-sys-man		.man
-./usr/share/man/man9/M_MOVE_PKTHDR.9		comp-sys-man		.man
+./usr/share/man/man9/M_MOVE_PKTHDR.9		comp-obsolete		obsolete
 ./usr/share/man/man9/M_PREPEND.9		comp-sys-man		.man
 ./usr/share/man/man9/M_TRAILINGSPACE.9		comp-sys-man		.man
 ./usr/share/man/man9/NDINIT.9			comp-sys-man		.man

Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.432 src/share/man/man9/Makefile:1.433
--- src/share/man/man9/Makefile:1.432	Thu Nov 15 10:06:06 2018
+++ src/share/man/man9/Makefile	Sat Dec 22 14:39:46 2018
@@ -1,4 +1,4 @@
-#   $NetBSD: Makefile,v 1.432 2018/11/15 10:06:06 maxv Exp $
+#   $NetBSD: Makefile,v 1.433 2018/12/22 14:39:46 maxv Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
 
@@ -497,9 +497,8 @@ MLINKS+=mbuf.9 m_get.9 mbuf.9 m_gethdr.9
 	mbuf.9 m_split.9 mbuf.9 m_adj.9 mbuf.9 m_free.9 \
 	mbuf.9 m_freem.9 mbuf.9 mtod.9 mbuf.9 mtocl.9 mbuf.9 cltom.9 \
 	mbuf.9 MGET.9 mbuf.9 MGETHDR.9 mbuf.9 MEXTMALLOC.9 \
-	mbuf.9 MEXTADD.9 mbuf.9 MCLGET.9 mbuf.9 M_COPY_PKTHDR.9 \
-	mbuf.9 M_MOVE_PKTHDR.9 \
-	mbuf.9 M_ALIGN.9 mbuf.9 MH_ALIGN.9 mbuf.9 M_LEADINGSPACE.9 \
+	mbuf.9 MEXTADD.9 mbuf.9 MCLGET.9 \
+	mbuf.9 M_LEADINGSPACE.9 \
 	mbuf.9 M_TRAILINGSPACE.9 mbuf.9 M_PREPEND.9 mbuf.9 MCHTYPE.9 \
 	mbuf.9 MFREE.9
 MLINKS+=mca.9 mca_intr_establish.9 \

Index: src/share/man/man9/mbuf.9
diff -u src/share/man/man9/mbuf.9:1.65 src/share/man/man9/mbuf.9:1.66
---

CVS commit: src/sys

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 14:28:57 UTC 2018

Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/dev: kttcp.c
src/sys/dev/pci/cxgb: cxgb_l2t.c cxgb_sge.c
src/sys/dist/pf/net: if_pfsync.c
src/sys/kern: uipc_mbuf.c uipc_socket.c
src/sys/net: if_ieee1394subr.c if_l2tp.c
src/sys/net80211: ieee80211_netbsd.c
src/sys/netatalk: aarp.c
src/sys/netbt: rfcomm_session.c
src/sys/netinet: if_arp.c ip_carp.c ip_icmp.c sctp_output.c
src/sys/netinet6: ip6_output.c mld6.c nd6_nbr.c
src/sys/netipsec: key.c
src/sys/nfs: nfs_subs.c

Log Message:
Replace M_ALIGN and MH_ALIGN by m_align.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/kttcp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/cxgb/cxgb_l2t.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/cxgb/cxgb_sge.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.228 -r1.229 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.267 -r1.268 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.64 -r1.65 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.33 -r1.34 src/sys/net80211/ieee80211_netbsd.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netatalk/aarp.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netbt/rfcomm_session.c
cvs rdiff -u -r1.277 -r1.278 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.100 -r1.101 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet/sctp_output.c
cvs rdiff -u -r1.215 -r1.216 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.99 -r1.100 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.257 -r1.258 src/sys/netipsec/key.c
cvs rdiff -u -r1.234 -r1.235 src/sys/nfs/nfs_subs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.38 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.39
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.38	Sat Dec 22 13:11:37 2018
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Sat Dec 22 14:28:56 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 maxv Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.39 2018/12/22 14:28:56 maxv Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.39 2018/12/22 14:28:56 maxv Exp $");
 
 #include 
 #include 
@@ -2110,7 +2110,7 @@ pq3etsec_tx_offload(
 		m_move_pkthdr(mn, m);
 		mn->m_next = m;
 		m = mn;
-		MH_ALIGN(m, sizeof(fcb));
+		m_align(m, sizeof(fcb));
 		m->m_len = sizeof(fcb);
 		*mp = m;
 	}

Index: src/sys/dev/kttcp.c
diff -u src/sys/dev/kttcp.c:1.41 src/sys/dev/kttcp.c:1.42
--- src/sys/dev/kttcp.c:1.41	Mon Sep  3 16:29:30 2018
+++ src/sys/dev/kttcp.c	Sat Dec 22 14:28:56 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kttcp.c,v 1.41 2018/09/03 16:29:30 riastradh Exp $	*/
+/*	$NetBSD: kttcp.c,v 1.42 2018/12/22 14:28:56 maxv Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.41 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.42 2018/12/22 14:28:56 maxv Exp $");
 
 #include 
 #include 
@@ -297,7 +297,7 @@ nopages:
 	 * for protocol headers in first mbuf.
 	 */
 	if (atomic && top == 0 && len < mlen)
-		MH_ALIGN(m, len);
+		m_align(m, len);
 }
 resid -= len;
 m->m_len = len;

Index: src/sys/dev/pci/cxgb/cxgb_l2t.c
diff -u src/sys/dev/pci/cxgb/cxgb_l2t.c:1.4 src/sys/dev/pci/cxgb/cxgb_l2t.c:1.5
--- src/sys/dev/pci/cxgb/cxgb_l2t.c:1.4	Tue Oct 11 12:53:56 2016
+++ src/sys/dev/pci/cxgb/cxgb_l2t.c	Sat Dec 22 14:28:56 2018
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.4 2016/10/11 12:53:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.5 2018/12/22 14:28:56 maxv Exp $");
 
 #include 
 #include 
@@ -114,7 +114,7 @@ setup_l2e_send_pending(struct toedev *de
 return (ENOMEM);
 }
 /*
- * XXX MH_ALIGN
+ * XXX m_align
  */
 req = mtod(m, struct cpl_l2t_write_req *);
 req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));

Index: src/sys/dev/pci/cxgb/cxgb_sge.c
diff -u src/sys/dev/pci/cxgb/cxgb_sge.c:1.6 src/sys/dev/pci/cxgb/cxgb_sge.c:1.7
--- src/sys/dev/pci/cxgb/cxgb_sge.c:1.6	Mon Sep  3 16:29:32 2018
+++ src/sys/dev/pci/cxgb/cxgb_sge.c	Sat Dec 22 14:28:56 2018
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.

CVS commit: src/sys

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 14:07:54 UTC 2018

Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_eth.c
src/sys/arch/arm/xscale: ixp425_if_npe.c
src/sys/dev/ic: bwi.c rt2560.c rt2661.c
src/sys/dev/pci: if_et.c if_ipw.c if_iwi.c if_wpi.c ubsec.c
src/sys/kern: uipc_mbuf.c
src/sys/netinet6: icmp6.c

Log Message:
Replace: M_COPY_PKTHDR -> m_copy_pkthdr. No functional change, since the
former is a macro to the latter.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/xscale/ixp425_if_npe.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/bwi.c src/sys/dev/ic/rt2560.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/rt2661.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_et.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/pci/if_iwi.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/ubsec.c
cvs rdiff -u -r1.227 -r1.228 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.241 -r1.242 src/sys/netinet6/icmp6.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.32 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.33
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.32	Mon Sep  3 16:29:23 2018
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c	Sat Dec 22 14:07:53 2018
@@ -35,7 +35,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.32 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.33 2018/12/22 14:07:53 maxv Exp $");
 
 #include 
 #include 
@@ -1546,7 +1546,7 @@ bcmeth_copy_packet(struct mbuf *m)
 	if (m0 == NULL) {
 		return NULL;
 	}
-	M_COPY_PKTHDR(m0, m);
+	m_copy_pkthdr(m0, m);
 	MCLAIM(m0, m->m_owner);
 	if (m0->m_pkthdr.len > MHLEN) {
 		MCLGET(m0, M_DONTWAIT);

Index: src/sys/arch/arm/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.34 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.35
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.34	Tue Jun 26 06:47:58 2018
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c	Sat Dec 22 14:07:53 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_if_npe.c,v 1.34 2018/06/26 06:47:58 msaitoh Exp $ */
+/*	$NetBSD: ixp425_if_npe.c,v 1.35 2018/12/22 14:07:53 maxv Exp $ */
 
 /*-
  * Copyright (c) 2006 Sam Leffler.  All rights reserved.
@@ -28,7 +28,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.34 2018/06/26 06:47:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.35 2018/12/22 14:07:53 maxv Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -1232,7 +1232,7 @@ npe_defrag(struct mbuf *m0)
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
-	M_COPY_PKTHDR(m, m0);
+	m_copy_pkthdr(m, m0);
 
 	if ((m->m_len = m0->m_pkthdr.len) > MHLEN) {
 		MCLGET(m, M_DONTWAIT);

Index: src/sys/dev/ic/bwi.c
diff -u src/sys/dev/ic/bwi.c:1.35 src/sys/dev/ic/bwi.c:1.36
--- src/sys/dev/ic/bwi.c:1.35	Wed Jul 25 07:55:44 2018
+++ src/sys/dev/ic/bwi.c	Sat Dec 22 14:07:53 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bwi.c,v 1.35 2018/07/25 07:55:44 msaitoh Exp $	*/
+/*	$NetBSD: bwi.c,v 1.36 2018/12/22 14:07:53 maxv Exp $	*/
 /*	$OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.35 2018/07/25 07:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.36 2018/12/22 14:07:53 maxv Exp $");
 
 #include 
 #include 
@@ -9192,7 +9192,7 @@ bwi_encap(struct bwi_softc *sc, int idx,
 			goto back;
 		}
 
-		M_COPY_PKTHDR(m_new, m);
+		m_copy_pkthdr(m_new, m);
 		if (m->m_pkthdr.len > MHLEN) {
 			MCLGET(m_new, M_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
Index: src/sys/dev/ic/rt2560.c
diff -u src/sys/dev/ic/rt2560.c:1.35 src/sys/dev/ic/rt2560.c:1.36
--- src/sys/dev/ic/rt2560.c:1.35	Mon Sep  3 16:29:31 2018
+++ src/sys/dev/ic/rt2560.c	Sat Dec 22 14:07:53 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rt2560.c,v 1.35 2018/09/03 16:29:31 riastradh Exp $	*/
+/*	$NetBSD: rt2560.c,v 1.36 2018/12/22 14:07:53 maxv Exp $	*/
 /*	$OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $  */
 /*	$FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
 
@@ -24,7 +24,7 @@
  * http://www.ralinktech.com/
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.35 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.36 2018/12/22 14:07:53 maxv Exp $");
 
 
 #include 
@@ -2016,7 +2016,7 @@ rt2560_tx_data(struct rt2560_softc *sc, 
 			return ENOMEM;
 		}
 
-		M_COPY_PKTHDR(mnew, m0);
+		m_copy_pkthdr(mnew, m0);
 		if (m0->m_pkthdr.len > MHLEN) {
 			MCLGET(mnew, M_DONTWAIT);
 			if (!(mnew->m_flags & M_EXT)) {

Index:

CVS commit: src/sys

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 13:55:56 UTC 2018

Modified Files:
src/sys/kern: uipc_mbuf.c
src/sys/net80211: ieee80211_netbsd.c ieee80211_netbsd.h
src/sys/sys: mbuf.h

Log Message:
Move m_align() back into the kernel, and switch M_ALIGN and MH_ALIGN to it.
Forcing a distinction between M_ALIGN and MH_ALIGN is too bug-friendly and
serves no particular purpose.


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.32 -r1.33 src/sys/net80211/ieee80211_netbsd.c
cvs rdiff -u -r1.21 -r1.22 src/sys/net80211/ieee80211_netbsd.h
cvs rdiff -u -r1.215 -r1.216 src/sys/sys/mbuf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.226 src/sys/kern/uipc_mbuf.c:1.227
--- src/sys/kern/uipc_mbuf.c:1.226	Sat Dec 22 13:11:37 2018
+++ src/sys/kern/uipc_mbuf.c	Sat Dec 22 13:55:56 2018
@@ -1,12 +1,12 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.227 2018/12/22 13:55:56 maxv Exp $	*/
 
 /*
- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
+ * NASA Ames Research Center, and Maxime Villard.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.227 2018/12/22 13:55:56 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
@@ -1754,6 +1754,30 @@ m_move_pkthdr(struct mbuf *to, struct mb
 }
 
 /*
+ * Set the m_data pointer of a newly-allocated mbuf to place an object of the
+ * specified size at the end of the mbuf, longword aligned.
+ */
+void
+m_align(struct mbuf *m, int len)
+{
+	int buflen, adjust;
+
+	KASSERT(len != M_COPYALL);
+	KASSERT(M_LEADINGSPACE(m) == 0);
+
+	if (m->m_flags & M_EXT)
+		buflen = m->m_ext.ext_size;
+	else if (m->m_flags & M_PKTHDR)
+		buflen = MHLEN;
+	else
+		buflen = MLEN;
+
+	KASSERT(len <= buflen);
+	adjust = buflen - len;
+	m->m_data += adjust &~ (sizeof(long)-1);
+}
+
+/*
  * Apply function f to the data in an mbuf chain starting "off" bytes from the
  * beginning, continuing for "len" bytes.
  */

Index: src/sys/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.32 src/sys/net80211/ieee80211_netbsd.c:1.33
--- src/sys/net80211/ieee80211_netbsd.c:1.32	Mon Sep  3 16:29:36 2018
+++ src/sys/net80211/ieee80211_netbsd.c	Sat Dec 22 13:55:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.32 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.33 2018/12/22 13:55:56 maxv Exp $ */
 
 /*
  * Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
@@ -31,7 +31,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $");
 #else
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.32 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.33 2018/12/22 13:55:56 maxv Exp $");
 #endif
 
 /*
@@ -724,27 +724,6 @@ ieee80211_load_module(const char *modnam
 /* -- */
 
 /*
- * Set the m_data pointer of a newly-allocated mbuf
- * to place an object of the specified size at the
- * end of the mbuf, longword aligned.
- */
-void
-m_align(struct mbuf *m, int len)
-{
-	int adjust;
-
-	KASSERT(len != M_COPYALL);
-
-	if (m->m_flags & M_EXT)
-		adjust = m->m_ext.ext_size - len;
-	else if (m->m_flags & M_PKTHDR)
-		adjust = MHLEN - len;
-	else
-		adjust = MLEN - len;
-	m->m_data += adjust &~ (sizeof(long)-1);
-}
-
-/*
  * Append the specified data to the indicated mbuf chain,
  * Extend the mbuf chain if the new data does not fit in
  * existing space.

Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.21 src/sys/net80211/ieee80211_netbsd.h:1.22
--- src/sys/net80211/ieee80211_netbsd.h:1.21	Thu May  3 17:14:37 2018
+++ src/sys/net80211/ieee80211_netbsd.h	Sat Dec 22 13:55:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.21 2018/05/03 17:14:37 maxv Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.22 2018/12/22 13:55:56 maxv Exp $ */
 /*-
  * Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
  * All rights reserved.
@@ -248,7 +248,6 @@ void	ieee80211_init(void);
 	static void name(void)
 #endif
 
-void	m_align(struct mbuf *, int);
 int	m_append(struct mbuf *, int, const void *);
 
 #endif /* !_NET80211_IEEE80211_NETBSD_H_ */

Index:

CVS commit: src/sys

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 13:11:38 UTC 2018

Modified Files:
src/sys/arch/arm/imx: if_enet.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/kern: uipc_mbuf.c
src/sys/net: if_l2tp.c if_sl.c if_strip.c
src/sys/net80211: ieee80211_input.c ieee80211_output.c
src/sys/netinet: ip_output.c sctp_indata.c
src/sys/netinet6: icmp6.c ip6_output.c
src/sys/netipsec: ipsec_mbuf.c
src/sys/nfs: nfs_subs.c

Log Message:
Replace: M_MOVE_PKTHDR -> m_move_pkthdr. No functional change, since the
former is a macro to the latter.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.225 -r1.226 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.30 -r1.31 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.129 -r1.130 src/sys/net/if_sl.c
cvs rdiff -u -r1.110 -r1.111 src/sys/net/if_strip.c
cvs rdiff -u -r1.114 -r1.115 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.63 -r1.64 src/sys/net80211/ieee80211_output.c
cvs rdiff -u -r1.308 -r1.309 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/sctp_indata.c
cvs rdiff -u -r1.240 -r1.241 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.214 -r1.215 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netipsec/ipsec_mbuf.c
cvs rdiff -u -r1.233 -r1.234 src/sys/nfs/nfs_subs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.15 src/sys/arch/arm/imx/if_enet.c:1.16
--- src/sys/arch/arm/imx/if_enet.c:1.15	Mon Sep  3 16:29:23 2018
+++ src/sys/arch/arm/imx/if_enet.c	Sat Dec 22 13:11:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_enet.c,v 1.15 2018/09/03 16:29:23 riastradh Exp $	*/
+/*	$NetBSD: if_enet.c,v 1.16 2018/12/22 13:11:37 maxv Exp $	*/
 
 /*
  * Copyright (c) 2014 Ryo Shimizu 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.15 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.16 2018/12/22 13:11:37 maxv Exp $");
 
 #include "vlan.h"
 
@@ -1505,7 +1505,7 @@ enet_encap_mbufalign(struct mbuf **mp)
 	}
 	MCLAIM(x, m->m_owner);
 	if (m->m_flags & M_PKTHDR)
-		M_MOVE_PKTHDR(x, m);
+		m_move_pkthdr(x, m);
 	x->m_len = m->m_len;
 	x->m_data = ALIGN_PTR(x->m_data,
 	ALIGNBYTE);
@@ -1630,7 +1630,7 @@ enet_encap_mbufalign(struct mbuf **mp)
 }
 MCLAIM(x, m->m_owner);
 if (m->m_flags & M_PKTHDR)
-	M_MOVE_PKTHDR(x, m);
+	m_move_pkthdr(x, m);
 x->m_data = ALIGN_PTR(x->m_data, ALIGNBYTE);
 memcpy(mtod(x, void *), mtod(m, void *),
 chiplen);

Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.37 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.38
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.37	Mon Sep  3 16:29:26 2018
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Sat Dec 22 13:11:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.37 2018/09/03 16:29:26 riastradh Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 maxv Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.37 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 maxv Exp $");
 
 #include 
 #include 
@@ -2107,7 +2107,7 @@ pq3etsec_tx_offload(
 			return;
 		}
 
-		M_MOVE_PKTHDR(mn, m);
+		m_move_pkthdr(mn, m);
 		mn->m_next = m;
 		m = mn;
 		MH_ALIGN(m, sizeof(fcb));

Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.225 src/sys/kern/uipc_mbuf.c:1.226
--- src/sys/kern/uipc_mbuf.c:1.225	Thu Nov 15 10:56:30 2018
+++ src/sys/kern/uipc_mbuf.c	Sat Dec 22 13:11:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.225 2018/11/15 10:56:30 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $	*/
 
 /*
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.225 2018/11/15 10:56:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
@@ -637,7 +637,7 @@ m_prepend(struct mbuf *m, int len, int h
 	}
 
 	if (m->m_flags & M_PKTHDR) {
-		M_MOVE_PKTHDR(mn, m);
+		m_move_pkthdr(mn, m);
 	} else {
 		MCLAIM(mn, m->m_owner);
 	}
@@ -995,7 +995,7 @@ m_ensure_contig(struct mbuf **m0, int le
 		}
 		MCLAIM(m, n->m_owner);
 		if (n->m_flags & M_PKTHDR) {
-			M_MOVE_PKTHDR(m, n);
+			m_move_pkthdr(m, n);
 		}
 	}
 	space = >m_dat[MLEN] - (m->m_data + m->m_len);
@@ -1216,7 +1216,7 @@ m_copyup(struct mbuf *n, int len, int ds
 		goto bad;
 	MCLAIM(m, n->m_owner);
 	if (n->m_flags & M_PKTHDR) {
-

CVS commit: src/sys/arch/x86/x86

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 10:00:39 UTC 2018

Modified Files:
src/sys/arch/x86/x86: spectre.c

Log Message:
In the end, disable the supposed architectural SpectreV2 mitigation on
AMD f12h and f16h. The SDMs of these CPUs haven't been updated since, and
we shouldn't assume the position of the bits, we just can't know where
they are.

Initially I included f12h and f16h because f10h is actually documented
to have a bit to disable the indirect branch predictor, and there were
patches available in SuSE and CentOS that were treating f10h/f12h/f16h
all the same. Knowing that SuSE has ties with AMD, it seemed safe to
assume that these patches were correct and that f12h and f16h could
indeed be treated the same way as f10h.

But these patches have now disappeared, and the main Linux branch
doesn't have them, without clear explanation. Therefore, I prefer to
roll-back.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/x86/spectre.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.21 src/sys/arch/x86/x86/spectre.c:1.22
--- src/sys/arch/x86/x86/spectre.c:1.21	Sat Dec 22 09:20:30 2018
+++ src/sys/arch/x86/x86/spectre.c	Sat Dec 22 10:00:39 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: spectre.c,v 1.21 2018/12/22 09:20:30 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.22 2018/12/22 10:00:39 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.21 2018/12/22 09:20:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.22 2018/12/22 10:00:39 maxv Exp $");
 
 #include "opt_spectre.h"
 
@@ -142,8 +142,6 @@ v2_detect_method(void)
 		 */
 		switch (CPUID_TO_FAMILY(ci->ci_signature)) {
 		case 0x10:
-		case 0x12:
-		case 0x16:
 			v2_mitigation_method = V2_MITIGATION_AMD_DIS_IND;
 			break;
 		default:

CVS commit: src/sys/arch/x86/x86

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 09:20:30 UTC 2018

Modified Files:
src/sys/arch/x86/x86: spectre.c

Log Message:
Add AMD_SSB_NO, so that we explicitly say than an AMD CPU is not affected
when it's not affected.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/spectre.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.20 src/sys/arch/x86/x86/spectre.c:1.21
--- src/sys/arch/x86/x86/spectre.c:1.20	Sat Dec 22 08:59:44 2018
+++ src/sys/arch/x86/x86/spectre.c	Sat Dec 22 09:20:30 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: spectre.c,v 1.20 2018/12/22 08:59:44 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.21 2018/12/22 09:20:30 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.20 2018/12/22 08:59:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.21 2018/12/22 09:20:30 maxv Exp $");
 
 #include "opt_spectre.h"
 
@@ -61,6 +61,7 @@ enum v4_mitigation {
 	V4_MITIGATION_NONE,
 	V4_MITIGATION_INTEL_SSBD,
 	V4_MITIGATION_INTEL_SSB_NO,
+	V4_MITIGATION_AMD_SSB_NO,
 	V4_MITIGATION_AMD_NONARCH_F15H,
 	V4_MITIGATION_AMD_NONARCH_F16H,
 	V4_MITIGATION_AMD_NONARCH_F17H
@@ -380,6 +381,9 @@ v4_set_name(void)
 		case V4_MITIGATION_INTEL_SSB_NO:
 			strlcat(name, "[Intel SSB_NO]", sizeof(name));
 			break;
+		case V4_MITIGATION_AMD_SSB_NO:
+			strlcat(name, "[AMD SSB_NO]", sizeof(name));
+			break;
 		case V4_MITIGATION_AMD_NONARCH_F15H:
 		case V4_MITIGATION_AMD_NONARCH_F16H:
 		case V4_MITIGATION_AMD_NONARCH_F17H:
@@ -403,11 +407,7 @@ v4_detect_method(void)
 		if (cpu_info_primary.ci_feat_val[7] & CPUID_SEF_ARCH_CAP) {
 			msr = rdmsr(MSR_IA32_ARCH_CAPABILITIES);
 			if (msr & IA32_ARCH_SSB_NO) {
-/*
- * The processor indicates it is not vulnerable
- * to the Speculative Store Bypass (SpectreV4)
- * flaw.
- */
+/* Not vulnerable to SpectreV4. */
 v4_mitigation_method = V4_MITIGATION_INTEL_SSB_NO;
 return;
 			}
@@ -432,6 +432,16 @@ v4_detect_method(void)
 			v4_mitigation_method = V4_MITIGATION_AMD_NONARCH_F17H;
 			return;
 		default:
+			if (cpu_info_primary.ci_max_ext_cpuid < 0x8008) {
+break;
+			}
+	 		x86_cpuid(0x8008, descs);
+			if (descs[1] & __BIT(26)) {
+/* Not vulnerable to SpectreV4. */
+v4_mitigation_method = V4_MITIGATION_AMD_SSB_NO;
+return;
+			}
+
 			break;
 		}
 	}
@@ -447,6 +457,7 @@ mitigation_v4_apply_cpu(bool enabled)
 	switch (v4_mitigation_method) {
 	case V4_MITIGATION_NONE:
 	case V4_MITIGATION_INTEL_SSB_NO:
+	case V4_MITIGATION_AMD_SSB_NO:
 		panic("impossible");
 	case V4_MITIGATION_INTEL_SSBD:
 		msrval = MSR_IA32_SPEC_CTRL;
@@ -527,6 +538,7 @@ mitigation_v4_change(bool enabled)
 		v4_set_name();
 		return 0;
 	case V4_MITIGATION_INTEL_SSB_NO:
+	case V4_MITIGATION_AMD_SSB_NO:
 		printf("[+] The CPU is not affected by SpectreV4\n");
 		mutex_exit(_lock);
 		return 0;
@@ -623,13 +635,15 @@ cpu_speculation_init(struct cpu_info *ci
 		v4_set_name();
 	}
 	if (v4_mitigation_method != V4_MITIGATION_NONE &&
-	v4_mitigation_method != V4_MITIGATION_INTEL_SSB_NO) {
+	v4_mitigation_method != V4_MITIGATION_INTEL_SSB_NO &&
+	v4_mitigation_method != V4_MITIGATION_AMD_SSB_NO) {
 		mitigation_v4_apply_cpu(ci, true);
 	}
 #else
 	if (ci == _info_primary) {
 		v4_detect_method();
-		if (v4_mitigation_method == V4_MITIGATION_INTEL_SSB_NO) {
+		if (v4_mitigation_method == V4_MITIGATION_INTEL_SSB_NO ||
+		v4_mitigation_method == V4_MITIGATION_AMD_SSB_NO) {
 			v4_mitigation_enabled = true;
 			v4_set_name();
 		}

CVS commit: src/sys/arch/x86/x86

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 08:59:45 UTC 2018

Modified Files:
src/sys/arch/x86/x86: spectre.c

Log Message:
If the CPU is not vulnerable to SpectreV4, say it in the sysctl by default.
Apply some minor style while here.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/spectre.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.19 src/sys/arch/x86/x86/spectre.c:1.20
--- src/sys/arch/x86/x86/spectre.c:1.19	Mon May 28 20:18:58 2018
+++ src/sys/arch/x86/x86/spectre.c	Sat Dec 22 08:59:44 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: spectre.c,v 1.19 2018/05/28 20:18:58 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.20 2018/12/22 08:59:44 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.19 2018/05/28 20:18:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.20 2018/12/22 08:59:44 maxv Exp $");
 
 #include "opt_spectre.h"
 
@@ -483,7 +483,8 @@ mitigation_v4_change_cpu(void *arg1, voi
 	mitigation_v4_apply_cpu(enabled);
 }
 
-static int mitigation_v4_change(bool enabled)
+static int
+mitigation_v4_change(bool enabled)
 {
 	struct cpu_info *ci = NULL;
 	CPU_INFO_ITERATOR cii;
@@ -609,6 +610,10 @@ cpu_speculation_init(struct cpu_info *ci
 	 *
 	 * cpu0 is the one that detects the method and sets the global
 	 * variable.
+	 *
+	 * Disabled by default, as recommended by AMD, but can be enabled
+	 * dynamically. We only detect if the CPU is not vulnerable, to
+	 * mark it as 'mitigated' in the sysctl.
 	 */
 #if 0
 	if (ci == _info_primary) {
@@ -617,9 +622,18 @@ cpu_speculation_init(struct cpu_info *ci
 		(v4_mitigation_method != V4_MITIGATION_NONE);
 		v4_set_name();
 	}
-	if (v4_mitigation_method != V4_MITIGATION_NONE) {
+	if (v4_mitigation_method != V4_MITIGATION_NONE &&
+	v4_mitigation_method != V4_MITIGATION_INTEL_SSB_NO) {
 		mitigation_v4_apply_cpu(ci, true);
 	}
+#else
+	if (ci == _info_primary) {
+		v4_detect_method();
+		if (v4_mitigation_method == V4_MITIGATION_INTEL_SSB_NO) {
+			v4_mitigation_enabled = true;
+			v4_set_name();
+		}
+	}
 #endif
 }

CVS commit: src/sys/arch

2018-12-22 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sat Dec 22 08:35:04 UTC 2018

Modified Files:
src/sys/arch/amd64/amd64: amd64_mainbus.c
src/sys/arch/i386/i386: i386_mainbus.c
src/sys/arch/x86/x86: mainbus.c
src/sys/arch/xen/x86: xen_mainbus.c

Log Message:
Style, once again.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/amd64/amd64_mainbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/i386/i386_mainbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/mainbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/xen/x86/xen_mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/amd64_mainbus.c
diff -u src/sys/arch/amd64/amd64/amd64_mainbus.c:1.3 src/sys/arch/amd64/amd64/amd64_mainbus.c:1.4
--- src/sys/arch/amd64/amd64/amd64_mainbus.c:1.3	Sat Dec 22 07:45:58 2018
+++ src/sys/arch/amd64/amd64/amd64_mainbus.c	Sat Dec 22 08:35:04 2018
@@ -1,5 +1,6 @@
-/*	$NetBSD: amd64_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $	*/
+/*	$NetBSD: amd64_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $	*/
 /*	NetBSD: mainbus.c,v 1.39 2018/12/02 08:19:44 cherry Exp 	*/
+
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  *
@@ -31,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $");
 
 #include 
 #include 
@@ -105,7 +106,7 @@ union amd64_mainbus_attach_args {
  * This is set when the ISA bus is attached.  If it's not set by the
  * time it's checked below, then mainbus attempts to attach an ISA.
  */
-int	isa_has_been_seen;
+int isa_has_been_seen;
 struct x86_isa_chipset x86_isa_chipset;
 #if NISA > 0
 static const struct isabus_attach_args mba_iba = {
@@ -120,7 +121,7 @@ struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
 int mp_nintr;
- 
+
 int mp_isa_bus = -1;
 int mp_eisa_bus = -1;
 
@@ -138,7 +139,6 @@ int mp_verbose = 0;
 # endif
 #endif
 
-
 /*
  * Probe for the mainbus; always succeeds.
  */
@@ -222,7 +222,6 @@ amd64_mainbus_attach(device_t parent, de
 		if (mp_verbose)
 			acpi_pci_link_state();
 #endif
-
 	}
 #endif
 
@@ -246,5 +245,5 @@ amd64_mainbus_print(void *aux, const cha
 
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
-	return (UNCONF);
+	return UNCONF;
 }

Index: src/sys/arch/i386/i386/i386_mainbus.c
diff -u src/sys/arch/i386/i386/i386_mainbus.c:1.3 src/sys/arch/i386/i386/i386_mainbus.c:1.4
--- src/sys/arch/i386/i386/i386_mainbus.c:1.3	Sat Dec 22 07:45:58 2018
+++ src/sys/arch/i386/i386/i386_mainbus.c	Sat Dec 22 08:35:04 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $	*/
+/*	$NetBSD: i386_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $	*/
 /*	NetBSD: mainbus.c,v 1.104 2018/12/02 08:19:44 cherry Exp 	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.3 2018/12/22 07:45:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.4 2018/12/22 08:35:04 maxv Exp $");
 
 #include 
 #include 
@@ -124,7 +124,7 @@ union i386_mainbus_attach_args {
  * This is set when the ISA bus is attached.  If it's not set by the
  * time it's checked below, then mainbus attempts to attach an ISA.
  */
-int	isa_has_been_seen;
+int isa_has_been_seen;
 struct x86_isa_chipset x86_isa_chipset;
 #if NISA > 0
 static const struct isabus_attach_args mba_iba = {
@@ -137,16 +137,16 @@ static const struct isabus_attach_args m
 /*
  * Same as above, but for EISA.
  */
-int	eisa_has_been_seen;
+int eisa_has_been_seen;
 
 #if defined(MPBIOS) || NACPICA > 0
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
 int mp_nintr;
- 
-int mp_isa_bus = -1;/* XXX */
-int mp_eisa_bus = -1;   /* XXX */
+
+int mp_isa_bus = -1;	/* XXX */
+int mp_eisa_bus = -1;	/* XXX */
 
 extern bool acpi_present;
 extern bool mpacpi_active;

Index: src/sys/arch/x86/x86/mainbus.c
diff -u src/sys/arch/x86/x86/mainbus.c:1.1 src/sys/arch/x86/x86/mainbus.c:1.2
--- src/sys/arch/x86/x86/mainbus.c:1.1	Sat Dec 22 07:45:59 2018
+++ src/sys/arch/x86/x86/mainbus.c	Sat Dec 22 08:35:04 2018
@@ -1,6 +1,6 @@
-/* $NetBSD: mainbus.c,v 1.1 2018/12/22 07:45:59 cherry Exp $ */
+/* $NetBSD: mainbus.c,v 1.2 2018/12/22 08:35:04 maxv Exp $ */
 
-/*-
+/*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.1 2018/12/22 07:45:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2018/12/22 08:35:04 maxv Exp $");
 
 #include 
 #include 
@@ -93,8 +93,7 @@ void i386_mainbus_attach(device_t, devic
 #endif
 
 #if defined(__x86_64__) && !defined(XEN)
-void
-amd64_mainbus_attach(device_t, device_t, void *);
+void amd64_mainbus_attach(device_t, device_t, void *);
 #endif
 
 #if defined(XEN)
@@

CVS commit: src/bin/cp

CVS commit: src/doc

CVS commit: src/sys/kern

CVS commit: src/sys/arch

CVS commit: src/sys/dev/pci

CVS commit: src/sys/kern

CVS commit: src/sys/kern

CVS commit: src/sys/dev/usb

CVS commit: src

CVS commit: src/sys

CVS commit: src/sys

CVS commit: src/sys

CVS commit: src/sys

CVS commit: src/sys/arch/x86/x86

CVS commit: src/sys/arch/x86/x86

CVS commit: src/sys/arch/x86/x86

CVS commit: src/sys/arch

17 matches

Site Navigation

Mail list logo

Footer information