CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Nov 17 07:52:07 UTC 2017

Modified Files:
src/sys/net: if_bridge.c

Log Message:
Add missing IFEF_NO_LINK_STATE_CHANGE to bridge


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/net/if_bridge.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/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.140 src/sys/net/if_bridge.c:1.141
--- src/sys/net/if_bridge.c:1.140	Thu Nov 16 03:07:18 2017
+++ src/sys/net/if_bridge.c	Fri Nov 17 07:52:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.140 2017/11/16 03:07:18 ozaki-r Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.141 2017/11/17 07:52:07 ozaki-r Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.140 2017/11/16 03:07:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.141 2017/11/17 07:52:07 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -424,7 +424,7 @@ bridge_clone_create(struct if_clone *ifc
 
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_softc = sc;
-	ifp->if_extflags = IFEF_MPSAFE;
+	ifp->if_extflags = IFEF_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_ioctl = bridge_ioctl;
 	ifp->if_output = bridge_output;

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Nov 17 07:42:29 UTC 2017

Modified Files:
src/share/man/man9: driver.9

Log Message:
Remove superfluous Pp. Fix xref.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/share/man/man9/driver.9

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

Modified files:

Index: src/share/man/man9/driver.9
diff -u src/share/man/man9/driver.9:1.31 src/share/man/man9/driver.9:1.32
--- src/share/man/man9/driver.9:1.31	Thu Nov 16 18:40:28 2017
+++ src/share/man/man9/driver.9	Fri Nov 17 07:42:29 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: driver.9,v 1.31 2017/11/16 18:40:28 riastradh Exp $
+.\" $NetBSD: driver.9,v 1.32 2017/11/17 07:42:29 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -62,7 +62,6 @@ statically inside the driver.
 For example, the interface to driver
 .Dq foo
 is defined with:
-.Pp
 .Bd -literal
 CFATTACH_DECL_NEW(foo, 			/* driver name */
 	sizeof(struct foo_softc),	/* size of instance data */
@@ -95,7 +94,6 @@ For example, the
 structure for driver
 .Dq foo
 is defined with:
-.Pp
 .Bd -literal
 struct foo_softc {
 	device_t sc_dev;		/* generic device info */
@@ -121,7 +119,6 @@ For example, the
 structure for driver
 .Dq foo
 is defined with:
-.Pp
 .Bd -literal
 const struct cdevsw foo_cdevsw {
 	int (*d_open)(dev_t, int, int, struct lwp *);
@@ -154,7 +151,6 @@ For example, the
 structure for driver
 .Dq foo
 is defined with:
-.Pp
 .Bd -literal
 const struct bdevsw foo_bdevsw {
 	int (*d_open)(dev_t, int, int, struct lwp *);
@@ -237,8 +233,9 @@ is a pointer to the driver's device stru
 The device's
 .Em softc
 structure can be obtained from it using the
-.Xr device_private 9
-function.
+.Fn device_private
+function (see
+.Xr disk 9 ) .
 The third argument
 .Fa aux
 is a pointer to the attachment structure.

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Nov 17 07:37:12 UTC 2017

Modified Files:
src/sys/net: bpf.c if.c if.h if_loop.c if_pppoe.c rtsock.c
src/sys/net/npf: npf_os.c
src/sys/netinet: if_arp.c igmp.c in.c ip_flow.c ip_input.c ip_output.c
src/sys/netinet6: frag6.c in6.c ip6_flow.c ip6_input.c mld6.c nd6.c
nd6_nbr.c
src/sys/netipsec: ipsec_output.c

Log Message:
Provide macros for softnet_lock and KERNEL_LOCK hiding NET_MPSAFE switch

It reduces C codes such as "#ifndef NET_MPSAFE KERNEL_LOCK(1, NULL); ..."
scattered all over the source code and makes it easy to identify remaining
KERNEL_LOCK and/or softnet_lock that are held even if NET_MPSAFE.

No functional change


To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/net/bpf.c
cvs rdiff -u -r1.396 -r1.397 src/sys/net/if.c
cvs rdiff -u -r1.242 -r1.243 src/sys/net/if.h
cvs rdiff -u -r1.98 -r1.99 src/sys/net/if_loop.c
cvs rdiff -u -r1.131 -r1.132 src/sys/net/if_pppoe.c
cvs rdiff -u -r1.229 -r1.230 src/sys/net/rtsock.c
cvs rdiff -u -r1.7 -r1.8 src/sys/net/npf/npf_os.c
cvs rdiff -u -r1.254 -r1.255 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.64 -r1.65 src/sys/netinet/igmp.c
cvs rdiff -u -r1.209 -r1.210 src/sys/netinet/in.c
cvs rdiff -u -r1.80 -r1.81 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.361 -r1.362 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.284 -r1.285 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.60 -r1.61 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.250 -r1.251 src/sys/netinet6/in6.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.182 -r1.183 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.89 -r1.90 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.238 -r1.239 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.138 -r1.139 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.64 -r1.65 src/sys/netipsec/ipsec_output.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/net/bpf.c
diff -u src/sys/net/bpf.c:1.218 src/sys/net/bpf.c:1.219
--- src/sys/net/bpf.c:1.218	Wed Oct 25 08:12:40 2017
+++ src/sys/net/bpf.c	Fri Nov 17 07:37:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpf.c,v 1.218 2017/10/25 08:12:40 maya Exp $	*/
+/*	$NetBSD: bpf.c,v 1.219 2017/11/17 07:37:12 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.218 2017/10/25 08:12:40 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.219 2017/11/17 07:37:12 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
@@ -484,13 +484,9 @@ bpf_detachd(struct bpf_d *d)
 		 * the interface was configured down, so only panic
 		 * if we don't get an unexpected error.
 		 */
-#ifndef NET_MPSAFE
-		KERNEL_LOCK(1, NULL);
-#endif
+		KERNEL_LOCK_UNLESS_NET_MPSAFE();
   		error = ifpromisc(bp->bif_ifp, 0);
-#ifndef NET_MPSAFE
-		KERNEL_UNLOCK_ONE(NULL);
-#endif
+		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 #ifdef DIAGNOSTIC
 		if (error)
 			printf("%s: ifpromisc failed: %d", __func__, error);
@@ -1022,13 +1018,9 @@ bpf_ioctl(struct file *fp, u_long cmd, v
 			break;
 		}
 		if (d->bd_promisc == 0) {
-#ifndef NET_MPSAFE
-			KERNEL_LOCK(1, NULL);
-#endif
+			KERNEL_LOCK_UNLESS_NET_MPSAFE();
 			error = ifpromisc(d->bd_bif->bif_ifp, 1);
-#ifndef NET_MPSAFE
-			KERNEL_UNLOCK_ONE(NULL);
-#endif
+			KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 			if (error == 0)
 d->bd_promisc = 1;
 		}
@@ -2249,13 +2241,9 @@ bpf_setdlt(struct bpf_d *d, u_int dlt)
 	bpf_attachd(d, bp);
 	reset_d(d);
 	if (opromisc) {
-#ifndef NET_MPSAFE
-		KERNEL_LOCK(1, NULL);
-#endif
+		KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		error = ifpromisc(bp->bif_ifp, 1);
-#ifndef NET_MPSAFE
-		KERNEL_UNLOCK_ONE(NULL);
-#endif
+		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 		if (error)
 			printf("%s: bpf_setdlt: ifpromisc failed (%d)\n",
 			bp->bif_ifp->if_xname, error);

Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.396 src/sys/net/if.c:1.397
--- src/sys/net/if.c:1.396	Mon Oct 23 09:21:20 2017
+++ src/sys/net/if.c	Fri Nov 17 07:37:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.396 2017/10/23 09:21:20 msaitoh Exp $	*/
+/*	$NetBSD: if.c,v 1.397 2017/11/17 07:37:12 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.396 2017/10/23 09:21:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.397 2017/11/17 07:37:12 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -2331,10 +2331,7 @@ if_link_state_change_si(void *arg)
 	int s;
 	uint8_t state;
 
-#ifndef NET_MPSAFE
-	mutex_enter(softnet_lock);
-	KERNEL_LOCK(1, NULL);
-#endif
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	s = splnet();
 
 	/* Pop a link state change from the queue and process it. */
@@ -2346,10 +2343,7 @@ if_link_state_change_si(void *arg)
 		softint_schedule(ifp->if_link_si);
 
 	splx(s);
-#ifndef NET_MPSAFE
-	

CVS commit: src/doc

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Nov 17 07:16:06 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Kernel ASLR and XSAVEOPT.


To generate a diff of this commit:
cvs rdiff -u -r1.2331 -r1.2332 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2331 src/doc/CHANGES:1.2332
--- src/doc/CHANGES:1.2331	Mon Nov 13 14:44:08 2017
+++ src/doc/CHANGES	Fri Nov 17 07:16:06 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2331 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2332 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -69,6 +69,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	mvsata(4): Add support for NCQ, and enable ATAPI support.
 		[jdolecek 20171007]
 	OpenSSH: Imported 7.6. [christos 20171007]
+	amd64: Add support for Kernel ASLR [maxv 20171010]
 	tmux(1): Imported 2.6. [christos 20171012]
 	amd64: Add support for SMAP. [maxv 20171017]
 	amd64: Add support for USER_LDT. [maxv 20171021]
@@ -79,6 +80,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	kernhist(9): Reworked the export-via-sysctl code to use uintptr_t
 		arguments, PR kern/52639.  Requires contemporaneous update
 		of vmstat(1). [pgoyette 20171028]
+	x86: Add support for XSAVEOPT [maxv 20171104]
 	acpi(4): Updated ACPICA to 20171110. [christos 2017]
 	sunxinand(4): Add driver for Allwinner NAND Flash Controller.
 		[jmcneill 20171113]

CVS commit: src/sys/arch/amd64/stand/prekern

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Nov 17 07:07:52 UTC 2017

Modified Files:
src/sys/arch/amd64/stand/prekern: Makefile console.c elf.c pdir.h
prekern.c

Log Message:
style


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/stand/prekern/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/stand/prekern/console.c \
src/sys/arch/amd64/stand/prekern/pdir.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/stand/prekern/elf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/stand/prekern/prekern.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/stand/prekern/Makefile
diff -u src/sys/arch/amd64/stand/prekern/Makefile:1.3 src/sys/arch/amd64/stand/prekern/Makefile:1.4
--- src/sys/arch/amd64/stand/prekern/Makefile:1.3	Tue Nov 14 07:06:34 2017
+++ src/sys/arch/amd64/stand/prekern/Makefile	Fri Nov 17 07:07:52 2017
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2017/11/14 07:06:34 maxv Exp $
+#	$NetBSD: Makefile,v 1.4 2017/11/17 07:07:52 maxv Exp $
 
 PROG=		prekern
-SRCS=	locore.S trap.S prekern.c mm.c console.c elf.c
+SRCS=		locore.S trap.S prekern.c mm.c console.c elf.c
 
 NOSSP=		# defined
 NOPIE=		# defined
@@ -22,8 +22,8 @@ CPPFLAGS+=	-D_STANDALONE
 .include 
 
 CPPFLAGS+=	-DKERNEL -D__x86_64__
-CFLAGS+=	-Wall -Werror -mno-red-zone -mno-mmx -mno-sse -mno-avx -ffreestanding
-CFLAGS+=	-Wstrict-prototypes
+CFLAGS+=	-Wall -Werror -Wstrict-prototypes
+CFLAGS+=	-mno-red-zone -mno-mmx -mno-sse -mno-avx -ffreestanding
 STRIPFLAG=
 LINKFLAGS=	-X -z max-page-size=0x10 -Ttext 0x10 -T prekern.ldscript
 

Index: src/sys/arch/amd64/stand/prekern/console.c
diff -u src/sys/arch/amd64/stand/prekern/console.c:1.2 src/sys/arch/amd64/stand/prekern/console.c:1.3
--- src/sys/arch/amd64/stand/prekern/console.c:1.2	Tue Nov 14 07:06:34 2017
+++ src/sys/arch/amd64/stand/prekern/console.c	Fri Nov 17 07:07:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: console.c,v 1.2 2017/11/14 07:06:34 maxv Exp $	*/
+/*	$NetBSD: console.c,v 1.3 2017/11/17 07:07:52 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -108,7 +108,7 @@ void print_state(bool ok, char *buf)
 
 void print_banner(void)
 {
-	char *banner = 
+	char *banner =
 		"   __ __\n"
 		"   \\__   \\___    |  | __ ___    \n"
 		"| ___/\\_  __ \\_/ __ \\|  |/ // __ \\_  __ \\/\\ \n"
Index: src/sys/arch/amd64/stand/prekern/pdir.h
diff -u src/sys/arch/amd64/stand/prekern/pdir.h:1.2 src/sys/arch/amd64/stand/prekern/pdir.h:1.3
--- src/sys/arch/amd64/stand/prekern/pdir.h:1.2	Sun Nov  5 16:27:18 2017
+++ src/sys/arch/amd64/stand/prekern/pdir.h	Fri Nov 17 07:07:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pdir.h,v 1.2 2017/11/05 16:27:18 maxv Exp $	*/
+/*	$NetBSD: pdir.h,v 1.3 2017/11/17 07:07:52 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -28,11 +28,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define PREKERNBASE		0x0
+#define PREKERNBASE	0x0
 #define PREKERNTEXTOFF	(PREKERNBASE + 0x10)
 
 #define L4_SLOT_PREKERN	0 /* pl4_i(PREKERNBASE) */
-#define L4_SLOT_PTE		255
+#define L4_SLOT_PTE	255
 
 #define PDIR_SLOT_KERN	L4_SLOT_PREKERN
 #define PDIR_SLOT_PTE	L4_SLOT_PTE

Index: src/sys/arch/amd64/stand/prekern/elf.c
diff -u src/sys/arch/amd64/stand/prekern/elf.c:1.15 src/sys/arch/amd64/stand/prekern/elf.c:1.16
--- src/sys/arch/amd64/stand/prekern/elf.c:1.15	Wed Nov 15 20:45:16 2017
+++ src/sys/arch/amd64/stand/prekern/elf.c	Fri Nov 17 07:07:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: elf.c,v 1.15 2017/11/15 20:45:16 maxv Exp $	*/
+/*	$NetBSD: elf.c,v 1.16 2017/11/17 07:07:52 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -292,6 +292,7 @@ elf_map_sections(void)
 		secalign = shdr->sh_addralign;
 		ASSERT(shdr->sh_offset != 0);
 		ASSERT(secpa % PAGE_SIZE == 0);
+		ASSERT(secpa + secsz <= kernpa_end);
 
 		secva = mm_map_segment(segtype, secpa, secsz, secalign);
 

Index: src/sys/arch/amd64/stand/prekern/prekern.c
diff -u src/sys/arch/amd64/stand/prekern/prekern.c:1.5 src/sys/arch/amd64/stand/prekern/prekern.c:1.6
--- src/sys/arch/amd64/stand/prekern/prekern.c:1.5	Tue Nov 14 07:06:34 2017
+++ src/sys/arch/amd64/stand/prekern/prekern.c	Fri Nov 17 07:07:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: prekern.c,v 1.5 2017/11/14 07:06:34 maxv Exp $	*/
+/*	$NetBSD: prekern.c,v 1.6 2017/11/17 07:07:52 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -46,10 +46,9 @@ struct bootinfo bootinfo;
 
 extern paddr_t kernpa_start, kernpa_end;
 
-extern uint64_t *gdt64_start;
-uint8_t idtstore[PAGE_SIZE];
-uint8_t faultstack[PAGE_SIZE];
-struct x86_64_tss prekern_tss;
+static uint8_t idtstore[PAGE_SIZE];
+static uint8_t faultstack[PAGE_SIZE];
+static struct x86_64_tss 

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu Nov 16 23:43:48 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Use correct combination of mix ring block size and vc playring used low
for signalling the writer or fetching data from the vc play ring filters.

When dealing with the ring buffer sc_mpr.s it is necessary to use the hwvc
or mixring block sizes as they represent the final size of the data to be
played back from the stream vc.

When dealing with sc_pustream when there is play back filters or not one
should use the vc->sc_mpr.blocksize, as this represents the amount of data
before going through play back filters.

This should address PR kern/52685.


To generate a diff of this commit:
cvs rdiff -u -r1.439 -r1.440 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.439 src/sys/dev/audio.c:1.440
--- src/sys/dev/audio.c:1.439	Thu Nov 16 23:32:11 2017
+++ src/sys/dev/audio.c	Thu Nov 16 23:43:48 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.439 2017/11/16 23:32:11 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.440 2017/11/16 23:43:48 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.439 2017/11/16 23:32:11 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.440 2017/11/16 23:43:48 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -3802,7 +3802,7 @@ audio_mix(void *v)
 		 * at accurate timing.  If used < blksize, uaudio(4) already
 		 * request transfer of garbage data.
 		 */
-		if (used <= cb->usedlow && !cb->copying &&
+		if (used <= sc->sc_hwvc->sc_mpr.usedlow && !cb->copying &&
 		vc->sc_npfilters > 0) {
 			/* we might have data in filter pipeline */
 			null_fetcher.fetch_to = null_fetcher_fetch_to;
@@ -3863,7 +3863,7 @@ audio_mix(void *v)
 			 audio_stream_get_used(>s), cb->usedlow));
 
 		if ((vc->sc_mode & AUMODE_PLAY) && !cb->pause) {
-			if (audio_stream_get_used(>s) <= cb->usedlow)
+			if (audio_stream_get_used(vc->sc_pustream) <= cb->usedlow)
 sc->schedule_wih = true;
 		}
 		/* Possible to return one or more "phantom blocks" now. */

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu Nov 16 23:32:12 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Add vc to debug messages in audio_mix.
Also add debug message when available data in the vc is less than the mix
ring blocksize.  NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.438 -r1.439 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.438 src/sys/dev/audio.c:1.439
--- src/sys/dev/audio.c:1.438	Wed Nov 15 04:28:45 2017
+++ src/sys/dev/audio.c	Thu Nov 16 23:32:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.438 2017/11/15 04:28:45 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.439 2017/11/16 23:32:11 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.438 2017/11/15 04:28:45 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.439 2017/11/16 23:32:11 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -3749,8 +3749,9 @@ audio_mix(void *v)
 		inp = cb->s.inp;
 		cb->stamp += blksize;
 		if (cb->mmapped) {
-			DPRINTF(("audio_pint: mmapped outp=%p cc=%d inp=%p\n",
- cb->s.outp, blksize, cb->s.inp));
+			DPRINTF(("audio_pint: vc=%p mmapped outp=%p cc=%d "
+ "inp=%p\n", vc, cb->s.outp, blksize,
+  cb->s.inp));
 			mutex_enter(sc->sc_intr_lock);
 			mix_func(sc, cb, vc);
 			cb->s.outp = audio_stream_add_outp(>s, cb->s.outp,
@@ -3825,6 +3826,9 @@ audio_mix(void *v)
 DPRINTFN(1, ("audio_pint: copying in "
 	 "progress\n"));
 			} else {
+DPRINTF(("audio_pint: used < blksize vc=%p "
+	  "used=%d blksize=%d\n", vc, used,
+	  blksize));
 inp = cb->s.inp;
 cc = blksize - (inp - cb->s.start) % blksize;
 if (cb->pause)
@@ -3847,17 +3851,16 @@ audio_mix(void *v)
 			}
 		}
 
-		DPRINTFN(5, ("audio_pint: outp=%p cc=%d\n", cb->s.outp,
-			 blksize));
+		DPRINTFN(5, ("audio_pint: vc=%p outp=%p used=%d cc=%d\n", vc,
+			 cb->s.outp, used, blksize));
 		mutex_enter(sc->sc_intr_lock);
 		mix_func(sc, cb, vc);
 		mutex_exit(sc->sc_intr_lock);
 		cb->s.outp = audio_stream_add_outp(>s, cb->s.outp, blksize);
 
-		DPRINTFN(2, ("audio_pint: mode=%d pause=%d used=%d lowat=%d\n",
-			 vc->sc_mode, cb->pause,
-			 audio_stream_get_used(vc->sc_pustream),
-			 cb->usedlow));
+		DPRINTFN(2, ("audio_pint: vc=%p mode=%d pause=%d used=%d "
+			 "lowat=%d\n", vc, vc->sc_mode, cb->pause,
+			 audio_stream_get_used(>s), cb->usedlow));
 
 		if ((vc->sc_mode & AUMODE_PLAY) && !cb->pause) {
 			if (audio_stream_get_used(>s) <= cb->usedlow)

CVS commit: src/sys/dev/usb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Nov 16 21:54:51 UTC 2017

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

Log Message:
don't lock if we are polling because we are already holding a spin lock
from uhci_poll().


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/dev/usb/uhci.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/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.277 src/sys/dev/usb/uhci.c:1.278
--- src/sys/dev/usb/uhci.c:1.277	Fri Oct 27 20:37:12 2017
+++ src/sys/dev/usb/uhci.c	Thu Nov 16 16:54:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.277 2017/10/28 00:37:12 pgoyette Exp $	*/
+/*	$NetBSD: uhci.c,v 1.278 2017/11/16 21:54:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.277 2017/10/28 00:37:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.278 2017/11/16 21:54:51 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2754,7 +2754,8 @@ uhci_device_intr_start(struct usbd_xfer 
 #endif
 
 	/* Take lock to protect nexttoggle */
-	mutex_enter(>sc_lock);
+	if (!sc->sc_bus.ub_usepolling)
+		mutex_enter(>sc_lock);
 	uhci_reset_std_chain(sc, xfer, xfer->ux_length, isread,
 	>nexttoggle, );
 
@@ -2786,7 +2787,8 @@ uhci_device_intr_start(struct usbd_xfer 
 	}
 	uhci_add_intr_list(sc, ux);
 	xfer->ux_status = USBD_IN_PROGRESS;
-	mutex_exit(>sc_lock);
+	if (!sc->sc_bus.ub_usepolling)
+		mutex_exit(>sc_lock);
 
 #ifdef UHCI_DEBUG
 	if (uhcidebug >= 10) {

CVS commit: src/tests/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Nov 16 19:41:42 UTC 2017

Modified Files:
src/tests/bin/sh: t_option.sh

Log Message:
Add a test case for "set -X".

Currently (or when testing any shell that does not support -X) the
test will be skipped (also for [m]ksh (but not ksh93 etc) where there
is an absurdly badly named -X option, skip the new test for them as well.)

When -X appears in /bin/sh, this will verify that it is probably working
(the test is MUCH more gruelling than any rational use of -X would be.)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/bin/sh/t_option.sh

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

Modified files:

Index: src/tests/bin/sh/t_option.sh
diff -u src/tests/bin/sh/t_option.sh:1.5 src/tests/bin/sh/t_option.sh:1.6
--- src/tests/bin/sh/t_option.sh:1.5	Sat Jul 15 18:52:21 2017
+++ src/tests/bin/sh/t_option.sh	Thu Nov 16 19:41:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_option.sh,v 1.5 2017/07/15 18:52:21 kre Exp $
+# $NetBSD: t_option.sh,v 1.6 2017/11/16 19:41:41 kre Exp $
 #
 # Copyright (c) 2016 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -77,7 +77,7 @@ test_option_on_off()
 			# if we do not do this, -x tracing splatters stderr
 			# for some shells, -v does as well (is that correct?)
 			case "${opt}" in
-			(*[xv]*)	exec 2>/dev/null;;
+			(*[xXv]*)	exec 2>/dev/null;;
 			esac
 
 			o="$-"
@@ -498,6 +498,329 @@ set_x_body() {
 	   'set -x; for i in 111 222 333; do printf "%s" $i; done; echo; exit 0'
 }
 
+atf_test_case set_X
+set_X_head() {
+	atf_set "descr" "Tests that 'set -X' turns on command exec logging " \
+	"and that it enables set -x and retains a single fd"
+}
+set_X_body() {
+
+	# First we need to verify that $TEST_SH supports -X
+	test_optional_on_off X	||
+		atf_skip "$TEST_SH does not support -X"
+
+	# and that the -X it implements is the -X we expect
+	$TEST_SH -c 'exec 2>/dev/null;
+		set +x; set -X;
+		case "$-" in (*x*) exit 0;; esac;
+		exit 1'		||
+			atf_skip "$TEST_SH supports -X but not 'the' -X"
+
+	# Above has already tested that set -X => set -x
+	# Now test that set +X => set +x
+	# and that set -x and set +x do not affect -X
+
+	atf_check -s exit:0 -o empty -e ignore ${TEST_SH} -c \
+		'set -x; set +X; case "$-" in (*x*) echo FAIL; exit 1;; esac'
+
+	atf_check -s exit:0 -o empty -e ignore ${TEST_SH} -c \
+		'set -X; set +x;
+		 case "$-" in (*x*) echo FAIL; exit 1;; esac
+		 case "$-" in (*X*) exit 0;; esac; echo ERROR; exit 2'
+
+	atf_check -s exit:0 -o empty -e ignore ${TEST_SH} -c \
+		'set -X; set +x; set -x;
+		 case "$-" in (*x*X*|*X*x*) exit 0;; esac; echo ERROR; exit 2'
+
+	atf_check -s exit:0 -o empty -e ignore ${TEST_SH} -c \
+		'set +X; set -x;
+		 case "$-" in (*X*) echo FAIL; exit 1;; esac
+		 case "$-" in (*x*) exit 0;; esac; echo ERROR; exit 2'
+
+	atf_check -s exit:0 -o empty -e ignore ${TEST_SH} -c \
+		'set +X; set -x; set +x;
+		 case "$-" in (*[xX]*) echo FAULT; exit 3;; esac'
+
+	# The following just verify regular tracing using -X instead of -x
+	# These are the same tests as the -x test (set_x) performs.
+
+	# check that cmd output appears after -X is enabled
+	atf_check -s exit:0 \
+			-o match:OKOK -o not-match:echo -o not-match:printf \
+			-e not-match:printf -e match:OK -e match:echo \
+		${TEST_SH} -ec 'printf "%s" OK; set -X; echo OK; exit 0'
+
+	# and that it stops again afer -X is disabled
+	atf_check -s exit:0 \
+			-o match:OKOK -o not-match:echo -o not-match:printf \
+			-e match:printf -e match:OK -e not-match:echo \
+	${TEST_SH} -ec 'set -X; printf "%s" OK; set +X; echo OK; exit 0'
+
+	# also check that PS4 is output correctly
+	atf_check -s exit:0 \
+			-o match:OK -o not-match:echo \
+			-e match:OK -e match:Run:echo \
+		${TEST_SH} -ec 'PS4=Run:; set -X; echo OK; exit 0'
+
+	# end copies of -x tests ...
+
+	# now check that we can move stderr around without affecting -X output
+
+	atf_check -s exit:0 \
+			-o match:OKOK -o not-match:echo -o not-match:printf \
+			-e match:printf -e match:OK -e match:echo \
+		${TEST_SH} -ecX 'printf "%s" OK; exec 2>/dev/null; echo OK'
+	atf_check -s exit:0 \
+			-o match:OKOK -o not-match:echo -o not-match:printf \
+			-e match:printf -e match:OK -e match:echo \
+		${TEST_SH} -ecX 'printf "%s" OK; exec 2>&1; echo OK'
+	atf_check -s exit:0 \
+			-o match:OKOK -o not-match:echo -o not-match:printf \
+			-e match:printf -e match:OK -e match:echo \
+		${TEST_SH} -ecX 'printf "%s" OK; exec 2>&-; echo OK'
+
+	# and that we can put tracing on an external file, leaving stderr alone
+
+	atf_require_prog grep
+
+	rm -f X-trace
+	atf_check -s exit:0 \
+			-o match:OKOK -o not-match:echo -o not-match:printf \
+			-e empty \
+		${TEST_SH} -ec 'PS4=; set -X 2>X-trace; printf "%s" OK; echo OK'
+	test -s X-trace || atf_fail "T1: Failed to create trace output file"
+	grep >/dev/null 2>&1 'printf.*%s.*OK' X-trace ||
+		atf_fail "T1: -X 

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Nov 16 19:41:02 UTC 2017

Modified Files:
src/bin/sh: output.c

Log Message:
Improve quoting in xtrace (-x) output ... if a string ("word") to be
output includes a single quote (') then see if using double-quotes
to quote it is reasonable (if no chars that are magic in " also appear).
If so, and if the string is not entirely the ' character, then
use " quoting.  This avoids some ugly looking results (occasionally).

Also, fix a bug introduced about 20 months ago where null strings
in xtrace output are dropped, instead of made explicit ('').
To observe this, before you get the fix: set -x; echo ''   (or similar.)

Move a comment from the wrong place to the right place.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/sh/output.c

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

Modified files:

Index: src/bin/sh/output.c
diff -u src/bin/sh/output.c:1.36 src/bin/sh/output.c:1.37
--- src/bin/sh/output.c:1.36	Thu May 18 13:31:10 2017
+++ src/bin/sh/output.c	Thu Nov 16 19:41:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: output.c,v 1.36 2017/05/18 13:31:10 kre Exp $	*/
+/*	$NetBSD: output.c,v 1.37 2017/11/16 19:41:02 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: output.c,v 1.36 2017/05/18 13:31:10 kre Exp $");
+__RCSID("$NetBSD: output.c,v 1.37 2017/11/16 19:41:02 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -146,6 +146,11 @@ out2shstr(const char *p)
 }
 
 
+/*
+ * ' is in this list, not because it does not require quoting
+ * (which applies to all the others) but because '' quoting cannot
+ * be used to quote it.
+ */
 static const char norm_chars [] = \
 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/+-=_,.'";
 
@@ -158,25 +163,42 @@ inquote(const char *p)
 	return s == NULL ? p[l] != '\0' : s - p > (off_t)l;
 }
 
-
 void
 outshstr(const char *p, struct output *file)
 {
-	/*
-	 * ' is in this list, not because it does not require quoting
-	 * (which applies to all the others) but because '' quoting cannot
-	 * be used to quote it.
-	 */
-	int need_q = p[0] == 0 || p[strspn(p, norm_chars)] != 0;
+	int need_q;
 	int inq;
 	char c;
 
+	if (strchr(p, '\'') != NULL && p[1] != '\0') {
+		/*
+		 * string contains ' in it, and is not only the '
+		 * see if " quoting will work
+		 */
+		size_t i = strcspn(p, "\\\"$`");
+
+		if (p[i] == '\0') {
+			/*
+			 * string contains no $ ` \ or " chars, perfect...
+			 *
+			 * We know it contains ' so needs quoting, so
+			 * this is easy...
+			 */
+			outc('"', file);
+			outstr(p, file);
+			outc('"', file);
+			return;
+		}
+	}
+
+	need_q = p[0] == 0 || p[strspn(p, norm_chars)] != 0;
+
 	/*
 	 * Don't emit ' unless something needs quoting before closing '
 	 */
-	if (need_q) {
-		if ((inq = inquote(p)) != 0)
-			outc('\'', file);
+	if (need_q && (p[0] == 0 || inquote(p) != 0)) {
+		outc('\'', file);
+		inq = 1;
 	} else
 		inq = 0;
 

CVS commit: src/share/man/man9

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Nov 16 18:40:28 UTC 2017

Modified Files:
src/share/man/man9: driver.9

Log Message:
Use device_private, not cast, to get at softc.

Someone^TM should turn this wall of prose into a nice itemized list
to make it clearer.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/share/man/man9/driver.9

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

Modified files:

Index: src/share/man/man9/driver.9
diff -u src/share/man/man9/driver.9:1.30 src/share/man/man9/driver.9:1.31
--- src/share/man/man9/driver.9:1.30	Mon Jul  3 21:28:48 2017
+++ src/share/man/man9/driver.9	Thu Nov 16 18:40:28 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: driver.9,v 1.30 2017/07/03 21:28:48 wiz Exp $
+.\" $NetBSD: driver.9,v 1.31 2017/11/16 18:40:28 riastradh Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -234,9 +234,11 @@ is a pointer to the driver's parent devi
 The second argument
 .Fa self
 is a pointer to the driver's device structure.
-It is also a pointer to our
+The device's
 .Em softc
-structure since the device structure is its first member.
+structure can be obtained from it using the
+.Xr device_private 9
+function.
 The third argument
 .Fa aux
 is a pointer to the attachment structure.

CVS commit: src/usr.bin/config

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Nov 16 17:08:07 UTC 2017

Modified Files:
src/usr.bin/config: defs.h main.c

Log Message:
When deleting orphans detect parent<->child loops and break them.
"active" is not a boolean, use the right comparison.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/usr.bin/config/defs.h
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/config/main.c

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

Modified files:

Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.99 src/usr.bin/config/defs.h:1.100
--- src/usr.bin/config/defs.h:1.99	Thu Jun 15 20:10:09 2017
+++ src/usr.bin/config/defs.h	Thu Nov 16 12:08:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.99 2017/06/16 00:10:09 christos Exp $	*/
+/*	$NetBSD: defs.h,v 1.100 2017/11/16 17:08:07 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -264,6 +264,8 @@ struct pspec {
 struct devbase {
 	const char *d_name;		/* e.g., "sd" */
 	TAILQ_ENTRY(devbase) d_next;
+	int 	d_level;
+	struct devbase *d_levelparent;
 	int	d_isdef;		/* set once properly defined */
 	int	d_ispseudo;		/* is a pseudo-device */
 	devmajor_t d_major;		/* used for "root on sd0", e.g. */

Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.91 src/usr.bin/config/main.c:1.92
--- src/usr.bin/config/main.c:1.91	Sun Sep  4 20:40:28 2016
+++ src/usr.bin/config/main.c	Thu Nov 16 12:08:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.91 2016/09/05 00:40:28 sevan Exp $	*/
+/*	$NetBSD: main.c,v 1.92 2017/11/16 17:08:07 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: main.c,v 1.91 2016/09/05 00:40:28 sevan Exp $");
+__RCSID("$NetBSD: main.c,v 1.92 2017/11/16 17:08:07 christos Exp $");
 
 #ifndef MAKE_BOOTSTRAP
 #include 
@@ -1868,6 +1868,15 @@ check_dead_devi(const char *key, void *v
 	return 0;
 }
 
+static int
+is_orphan_loop(const struct devbase *d, const struct devbase *p)
+{
+
+	for (; p && d != p; p = p->d_levelparent)
+		continue;
+	return d == p;
+}
+
 static void
 do_kill_orphans(struct devbase *d, struct attr *at, struct devbase *parent,
 int state)
@@ -1879,6 +1888,9 @@ do_kill_orphans(struct devbase *d, struc
 	struct pspec *p;
 	int active = 0;
 
+	if (d->d_levelparent == NULL)
+		d->d_levelparent = parent;
+
 	/*
 	 * A pseudo-device will always attach at root, and if it has an
 	 * instance (it cannot have more than one), it is enough to consider
@@ -1938,9 +1950,9 @@ do_kill_orphans(struct devbase *d, struc
 		/*
 		 * If we've been there but have made no change, stop.
 		 */
-		if (seen && !active)
+		if (seen && active != DEVI_ACTIVE)
 			return;
-		if (!active) {
+		if (active != DEVI_ACTIVE) {
 			struct cdd_params cdd = { d, at, parent };
 			/* Look for a matching dead devi */
 			if (ht_enumerate(deaddevitab, check_dead_devi, ) &&
@@ -1963,9 +1975,15 @@ do_kill_orphans(struct devbase *d, struc
 
 	for (al = d->d_attrs; al != NULL; al = al->al_next) {
 		a = al->al_this;
-		for (nv1 = a->a_devs; nv1 != NULL; nv1 = nv1->nv_next)
+		for (nv1 = a->a_devs; nv1 != NULL; nv1 = nv1->nv_next) {
+			if (is_orphan_loop(nv1->nv_ptr, d)) {
+if (d->d_level++ > 1)
+	continue;
+			}
 			do_kill_orphans(nv1->nv_ptr, a, d, active);
+		}
 	}
+	d->d_levelparent = NULL;
 }
 
 static int

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Nov 16 14:28:19 UTC 2017

Modified Files:
src/doc: 3RDPARTY

Log Message:
binutils-2.29.1 out.


To generate a diff of this commit:
cvs rdiff -u -r1.1483 -r1.1484 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.1483 src/doc/3RDPARTY:1.1484
--- src/doc/3RDPARTY:1.1483	Mon Nov 13 08:56:54 2017
+++ src/doc/3RDPARTY	Thu Nov 16 14:28:19 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1483 2017/11/13 08:56:54 mrg Exp $
+#	$NetBSD: 3RDPARTY,v 1.1484 2017/11/16 14:28:19 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -186,7 +186,7 @@ Todo[5]: Reconcile the doc directory.
 
 Package:	binutils
 Version:	2.27
-Current Vers:	2.29
+Current Vers:	2.29.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/binutils/
 Home Page:	http://www.gnu.org/software/binutils/

CVS commit: src/external/gpl3/gcc.old/dist/gcc

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Nov 16 13:54:58 UTC 2017

Modified Files:
src/external/gpl3/gcc.old/dist/gcc: tree-ssa-ccp.c

Log Message:
Match hppa JEMALLOC_TINY_MIN_2POW


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc.old/dist/gcc/tree-ssa-ccp.c

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

Modified files:

Index: src/external/gpl3/gcc.old/dist/gcc/tree-ssa-ccp.c
diff -u src/external/gpl3/gcc.old/dist/gcc/tree-ssa-ccp.c:1.6 src/external/gpl3/gcc.old/dist/gcc/tree-ssa-ccp.c:1.7
--- src/external/gpl3/gcc.old/dist/gcc/tree-ssa-ccp.c:1.6	Sun Jul 23 01:10:58 2017
+++ src/external/gpl3/gcc.old/dist/gcc/tree-ssa-ccp.c	Thu Nov 16 13:54:58 2017
@@ -2850,7 +2850,9 @@ make_pass_fold_builtins (gcc::context *c
  * time assert that the value matches gcc's MALLOC_ABI_ALIGNMENT here.
  */
 
-#if defined(__alpha__) || defined(__amd64__) || defined(__sparc64__)	\
+#if defined(__hppa__)
+#define	JEMALLOC_TINY_MIN_2POW	4
+#elif defined(__alpha__) || defined(__amd64__) || defined(__sparc64__)	\
  ||	(defined(__arm__) && defined(__ARM_EABI__)) \
  || defined(__ia64__) || defined(__powerpc__) \
  || ((defined(__mips__) || defined(__riscv__)) && defined(_LP64))

CVS commit: src/external/gpl3/gcc/dist/gcc

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Nov 16 13:54:42 UTC 2017

Modified Files:
src/external/gpl3/gcc/dist/gcc: tree-ssa-ccp.c

Log Message:
Match hppa JEMALLOC_TINY_MIN_2POW


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c
diff -u src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.7 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.8
--- src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.7	Fri Aug  5 16:25:19 2016
+++ src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c	Thu Nov 16 13:54:42 2017
@@ -2850,7 +2850,9 @@ make_pass_fold_builtins (gcc::context *c
  * time assert that the value matches gcc's MALLOC_ABI_ALIGNMENT here.
  */
 
-#if defined(__alpha__) || defined(__amd64__) || defined(__sparc64__)	\
+#if defined(__hppa__)
+#define	JEMALLOC_TINY_MIN_2POW	4
+#elif defined(__alpha__) || defined(__amd64__) || defined(__sparc64__)	\
  ||	(defined(__arm__) && defined(__ARM_EABI__)) \
  || defined(__ia64__) || defined(__powerpc__) \
  || ((defined(__mips__) || defined(__riscv__)) && defined(_LP64))

CVS commit: src/lib/libc/stdlib

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Nov 16 13:54:00 UTC 2017

Modified Files:
src/lib/libc/stdlib: jemalloc.c

Log Message:
The HPPA architectures (1.1 and 2.0) both define quadruple-word (128-bit)
floating point types.  Adjust alignment to match.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/stdlib/jemalloc.c

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

Modified files:

Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.42 src/lib/libc/stdlib/jemalloc.c:1.43
--- src/lib/libc/stdlib/jemalloc.c:1.42	Fri May 19 19:55:16 2017
+++ src/lib/libc/stdlib/jemalloc.c	Thu Nov 16 13:54:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: jemalloc.c,v 1.42 2017/05/19 19:55:16 christos Exp $	*/
+/*	$NetBSD: jemalloc.c,v 1.43 2017/11/16 13:54:00 skrll Exp $	*/
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans .
@@ -118,7 +118,7 @@
 
 #include 
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.42 2017/05/19 19:55:16 christos Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.43 2017/11/16 13:54:00 skrll Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -287,6 +287,7 @@ __RCSID("$NetBSD: jemalloc.c,v 1.42 2017
 #endif
 #ifdef __hppa__ 
 #  define QUANTUM_2POW_MIN 4
+#  define TINY_MIN_2POW4
 #  define SIZEOF_PTR_2POW  2
 #  define USE_BRK   
 #endif   

CVS commit: src/sys/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Nov 16 10:40:30 UTC 2017

Modified Files:
src/sys/sys: param.h

Log Message:
Bump kernel version for IFEF_MPSAFE

Welcome to 8.99.7


To generate a diff of this commit:
cvs rdiff -u -r1.551 -r1.552 src/sys/sys/param.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/sys/param.h
diff -u src/sys/sys/param.h:1.551 src/sys/sys/param.h:1.552
--- src/sys/sys/param.h:1.551	Sun Nov 12 19:46:06 2017
+++ src/sys/sys/param.h	Thu Nov 16 10:40:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.551 2017/11/12 19:46:06 riastradh Exp $	*/
+/*	$NetBSD: param.h,v 1.552 2017/11/16 10:40:29 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	899000600	/* NetBSD 8.99.6 */
+#define	__NetBSD_Version__	899000700	/* NetBSD 8.99.7 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)