CVS commit: src/usr.bin/quota

2020-01-20 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Jan 21 07:57:49 UTC 2020

Modified Files:
src/usr.bin/quota: quota.1

Log Message:
Use standard Dd format. Remove superfluous Pp


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/quota/quota.1

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/quota/quota.1
diff -u src/usr.bin/quota/quota.1:1.22 src/usr.bin/quota/quota.1:1.23
--- src/usr.bin/quota/quota.1:1.22	Mon Jan 20 21:38:29 2020
+++ src/usr.bin/quota/quota.1	Tue Jan 21 07:57:49 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: quota.1,v 1.22 2020/01/20 21:38:29 dholland Exp $
+.\"	$NetBSD: quota.1,v 1.23 2020/01/21 07:57:49 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd Jan 20, 2020
+.Dd January 20, 2020
 .Dt QUOTA 1
 .Os
 .Sh NAME
@@ -60,7 +60,6 @@ displays users' disk usage and limits.
 By default only the user quotas are printed.
 .Pp
 Options:
-.Pp
 .Bl -tag -width Ds
 .It Fl d
 Query the kernel for default user or group quota instead of a specific



CVS commit: src/share/man/man9

2020-01-20 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Jan 21 07:53:51 UTC 2020

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

Log Message:
Remove superfluous Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/in_getifa.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/in_getifa.9
diff -u src/share/man/man9/in_getifa.9:1.10 src/share/man/man9/in_getifa.9:1.11
--- src/share/man/man9/in_getifa.9:1.10	Mon Jan 20 13:08:40 2020
+++ src/share/man/man9/in_getifa.9	Tue Jan 21 07:53:51 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: in_getifa.9,v 1.10 2020/01/20 13:08:40 nia Exp $
+.\" $NetBSD: in_getifa.9,v 1.11 2020/01/21 07:53:51 wiz Exp $
 .\"
 .\" Copyright (c) 2006 David Young.  All rights reserved.
 .\"
@@ -160,7 +160,6 @@ The operator may also set a global polic
 interfaces whose policy they do not set individually.
 .Pp
 Here is the sysctl tree for the policy at system startup:
-.Pp
 .Bd -literal -offset indent
 net.inet.ip.selectsrc.default = index
 net.inet.ip.interfaces.ath0.selectsrc =



CVS commit: src/usr.sbin/sysinst

2020-01-20 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Jan 21 06:44:40 UTC 2020

Modified Files:
src/usr.sbin/sysinst: disklabel.c

Log Message:
hide disklabel_non_bootable() under NO_DISKLABEL_BOOT like the usage.

should fix most builds.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sysinst/disklabel.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.sbin/sysinst/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.31 src/usr.sbin/sysinst/disklabel.c:1.32
--- src/usr.sbin/sysinst/disklabel.c:1.31	Mon Jan 20 21:26:35 2020
+++ src/usr.sbin/sysinst/disklabel.c	Tue Jan 21 06:44:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.c,v 1.31 2020/01/20 21:26:35 martin Exp $	*/
+/*	$NetBSD: disklabel.c,v 1.32 2020/01/21 06:44:40 mrg Exp $	*/
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -123,12 +123,14 @@ disklabel_cylinder_size(const struct dis
 	return parts->l.d_secpercyl;
 }
 
+#ifdef NO_DISKLABEL_BOOT
 static bool
 disklabel_non_bootable(const char *disk)
 {
 
 	return false;
 }
+#endif
 
 static struct disk_partitions *
 disklabel_parts_new(const char *dev, daddr_t start, daddr_t len,



Re: CVS commit: src/sys [freeze on boot]

2020-01-20 Thread Andrew Doran
Hi,

This also happened the last time I touched rw_downgrade(), and I backed out
the change then, but both times I don't see the bug.  I have some questions:

- Are you running DIAGNOSTIC and/or LOCKDEBUG?  I would be very interested
  to see what happens with a LOCKDEBUG kernel here.
- Do you have an ATI Radeon graphics chip?
- Are you using ZFS?

Thanks,
Andrew


On Mon, Jan 20, 2020 at 12:41:37PM +0900, Ryo ONODERA wrote:
> Hi,
> 
> After this commit, the kernel stalls just before root file system
> will be found on my NetBSD/amd64 laptop.
> 
> Reverting
> src/sys/kern/kern_rwlock.c to r1.60
> and
> src/sys/sys/rwlock.h to r1.12
> in latest -current tree and I can get the kernel that works like
> before.
> 
> And on another laptop, the problematic kernel stalls before root file
> system detection like my laptop.
> 
> It may be universal problem.
> 
> Could you take a look at this problem?
> 
> Thank you.
> 
> "Andrew Doran"  writes:
> 
> > Module Name:src
> > Committed By:   ad
> > Date:   Sun Jan 19 18:34:24 UTC 2020
> >
> > Modified Files:
> > src/sys/kern: kern_rwlock.c
> > src/sys/sys: rwlock.h
> >
> > Log Message:
> > Tidy rwlocks a bit, no functional change intended.  Mainly:
> >
> > - rw_downgrade(): do it in a for () loop like all the others.
> > - Explicitly carry around RW_NODEBUG - don't be lazy.
> > - Remove pointless macros.
> > - Don't make assertions conditional on LOCKDEBUG, there's no reason.
> > - Make space for a new flag bit (not added yet).
> >
> >
> > To generate a diff of this commit:
> > cvs rdiff -u -r1.60 -r1.61 src/sys/kern/kern_rwlock.c
> > cvs rdiff -u -r1.12 -r1.13 src/sys/sys/rwlock.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/kern_rwlock.c
> > diff -u src/sys/kern/kern_rwlock.c:1.60 src/sys/kern/kern_rwlock.c:1.61
> > --- src/sys/kern/kern_rwlock.c:1.60 Sun Jan 12 18:37:10 2020
> > +++ src/sys/kern/kern_rwlock.c  Sun Jan 19 18:34:24 2020
> > @@ -1,4 +1,4 @@
> > -/* $NetBSD: kern_rwlock.c,v 1.60 2020/01/12 18:37:10 ad Exp $  */
> > +/* $NetBSD: kern_rwlock.c,v 1.61 2020/01/19 18:34:24 ad Exp $  */
> >  
> >  /*-
> >   * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020
> > @@ -39,7 +39,9 @@
> >   */
> >  
> >  #include 
> > -__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.60 2020/01/12 18:37:10 ad 
> > Exp $");
> > +__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.61 2020/01/19 18:34:24 ad 
> > Exp $");
> > +
> > +#include "opt_lockdebug.h"
> >  
> >  #define__RWLOCK_PRIVATE
> >  
> > @@ -63,58 +65,32 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rwlock.
> >   * LOCKDEBUG
> >   */
> >  
> > -#if defined(LOCKDEBUG)
> > -
> > -#defineRW_WANTLOCK(rw, op) 
> > \
> > -   LOCKDEBUG_WANTLOCK(RW_DEBUG_P(rw), (rw),\
> > -   (uintptr_t)__builtin_return_address(0), op == RW_READER);
> > -#defineRW_LOCKED(rw, op)   
> > \
> > -   LOCKDEBUG_LOCKED(RW_DEBUG_P(rw), (rw), NULL,\
> > -   (uintptr_t)__builtin_return_address(0), op == RW_READER);
> > -#defineRW_UNLOCKED(rw, op) 
> > \
> > -   LOCKDEBUG_UNLOCKED(RW_DEBUG_P(rw), (rw),\
> > -   (uintptr_t)__builtin_return_address(0), op == RW_READER);
> > -#defineRW_DASSERT(rw, cond)
> > \
> > -do {   
> > \
> > -   if (__predict_false(!(cond)))   \
> > -   rw_abort(__func__, __LINE__, rw, "assertion failed: " #cond);\
> > -} while (/* CONSTCOND */ 0);
> > -
> > -#else  /* LOCKDEBUG */
> > -
> > -#defineRW_WANTLOCK(rw, op) /* nothing */
> > -#defineRW_LOCKED(rw, op)   /* nothing */
> > -#defineRW_UNLOCKED(rw, op) /* nothing */
> > -#defineRW_DASSERT(rw, cond)/* nothing */
> > +#defineRW_DEBUG_P(rw)  (((rw)->rw_owner & RW_NODEBUG) == 0)
> >  
> > -#endif /* LOCKDEBUG */
> > +#defineRW_WANTLOCK(rw, op) \
> > +LOCKDEBUG_WANTLOCK(RW_DEBUG_P(rw), (rw), \
> > +(uintptr_t)__builtin_return_address(0), op == RW_READER);
> > +#defineRW_LOCKED(rw, op) \
> > +LOCKDEBUG_LOCKED(RW_DEBUG_P(rw), (rw), NULL, \
> > +(uintptr_t)__builtin_return_address(0), op == RW_READER);
> > +#defineRW_UNLOCKED(rw, op) \
> > +LOCKDEBUG_UNLOCKED(RW_DEBUG_P(rw), (rw), \
> > +(uintptr_t)__builtin_return_address(0), op == RW_READER);
> >  
> >  /*
> >   * DIAGNOSTIC
> >   */
> >  
> >  #if defined(DIAGNOSTIC)
> > -
> > -#defineRW_ASSERT(rw, cond) 
> > \
> > -do {   
> > \
> > -   if (__predict_false(!(cond))) 

CVS commit: src/sys/arch/arm/conf

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Jan 21 05:05:22 UTC 2020

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Sort a bit


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/arm/conf/files.arm

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/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.151 src/sys/arch/arm/conf/files.arm:1.152
--- src/sys/arch/arm/conf/files.arm:1.151	Tue Jan 21 05:02:55 2020
+++ src/sys/arch/arm/conf/files.arm	Tue Jan 21 05:05:22 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.151 2020/01/21 05:02:55 skrll Exp $
+#	$NetBSD: files.arm,v 1.152 2020/01/21 05:05:22 skrll Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -154,8 +154,8 @@ define	bus_space_generic
 file	arch/arm/arm/bus_space_asm_generic.S	bus_space_generic
 file	arch/arm/arm/bus_space_notimpl.S	arm32
 
-file	arch/arm/arm/arm_machdep.c
 file	arch/arm/arm/arm_cpu_topology.c
+file	arch/arm/arm/arm_machdep.c
 file	arch/arm/arm/ast.c
 file	arch/arm/arm/bcopyinout.S
 file	arch/arm/arm/blockio.S
@@ -164,7 +164,6 @@ file	arch/arm/arm/compat_13_machdep.c	co
 file	arch/arm/arm/compat_16_machdep.c	compat_16
 file	arch/arm/arm/copystr.S
 file	arch/arm/arm/core_machdep.c		coredump
-file	arch/arm/arm/cpu_in_cksum.S		(inet | inet6) & cpu_in_cksum
 file	arch/arm/arm/cpufunc.c
 file	arch/arm/arm/cpufunc_asm.S
 file	arch/arm/arm/cpufunc_asm_arm67.S	cpu_arm6 | cpu_arm7
@@ -200,6 +199,7 @@ file	arch/arm/arm/cpufunc_asm_xscale.S	c
 file	arch/arm/arm/cpufunc_asm_ixp12x0.S	cpu_ixp12x0
 file	arch/arm/arm/cpufunc_asm_sheeva.S	cpu_sheeva
 file	arch/arm/arm/cpu_exec.c
+file	arch/arm/arm/cpu_in_cksum.S		(inet | inet6) & cpu_in_cksum
 file	arch/arm/arm/fusu.S
 file	arch/arm/arm/idle_machdep.c
 file	arch/arm/arm/lock_cas.S



CVS commit: src/sys/arch/arm/conf

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Jan 21 05:02:55 UTC 2020

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/arm/conf/files.arm

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/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.150 src/sys/arch/arm/conf/files.arm:1.151
--- src/sys/arch/arm/conf/files.arm:1.150	Wed Jan 15 08:34:04 2020
+++ src/sys/arch/arm/conf/files.arm	Tue Jan 21 05:02:55 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.150 2020/01/15 08:34:04 mrg Exp $
+#	$NetBSD: files.arm,v 1.151 2020/01/21 05:02:55 skrll Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -155,7 +155,7 @@ file	arch/arm/arm/bus_space_asm_generic.
 file	arch/arm/arm/bus_space_notimpl.S	arm32
 
 file	arch/arm/arm/arm_machdep.c
-file	arch/arm/arm/arm_cpu_topology.c	
+file	arch/arm/arm/arm_cpu_topology.c
 file	arch/arm/arm/ast.c
 file	arch/arm/arm/bcopyinout.S
 file	arch/arm/arm/blockio.S



CVS commit: src/sys/arch/arm/arm

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Jan 21 04:59:47 UTC 2020

Modified Files:
src/sys/arch/arm/arm: arm_machdep.c

Log Message:
Remove unnecessary cast


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/arm/arm/arm_machdep.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/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.60 src/sys/arch/arm/arm/arm_machdep.c:1.61
--- src/sys/arch/arm/arm/arm_machdep.c:1.60	Tue Jan  7 09:57:10 2020
+++ src/sys/arch/arm/arm/arm_machdep.c	Tue Jan 21 04:59:47 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm_machdep.c,v 1.60 2020/01/07 09:57:10 skrll Exp $	*/
+/*	$NetBSD: arm_machdep.c,v 1.61 2020/01/21 04:59:47 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.60 2020/01/07 09:57:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.61 2020/01/21 04:59:47 skrll Exp $");
 
 #include 
 #include 
@@ -309,7 +309,7 @@ cpu_kpreempt_enter(uintptr_t where, int 
 void
 cpu_kpreempt_exit(uintptr_t where)
 {
-	atomic_and_uint(()->ci_astpending, (unsigned int)~__BIT(1));
+	atomic_and_uint(()->ci_astpending, ~__BIT(1));
 }
 
 bool



CVS commit: src/sys/arch/aarch64/conf

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Jan 21 04:54:11 UTC 2020

Modified Files:
src/sys/arch/aarch64/conf: files.aarch64

Log Message:
Small re-org.  NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/conf/files.aarch64

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/aarch64/conf/files.aarch64
diff -u src/sys/arch/aarch64/conf/files.aarch64:1.17 src/sys/arch/aarch64/conf/files.aarch64:1.18
--- src/sys/arch/aarch64/conf/files.aarch64:1.17	Wed Jan 15 08:34:04 2020
+++ src/sys/arch/aarch64/conf/files.aarch64	Tue Jan 21 04:54:11 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.aarch64,v 1.17 2020/01/15 08:34:04 mrg Exp $
+#	$NetBSD: files.aarch64,v 1.18 2020/01/21 04:54:11 skrll Exp $
 
 defflag opt_cpuoptions.h	AARCH64_ALIGNMENT_CHECK
 defflag opt_cpuoptions.h	AARCH64_EL0_STACK_ALIGNMENT_CHECK
@@ -40,10 +40,6 @@ defparam opt_console.h		CONADDR
 # FP support
 file	arch/aarch64/aarch64/fpu.c
 
-file	arch/arm/arm/arm_generic_dma.c
-file	arch/arm/arm/arm_cpu_topology.c
-file	arch/arm/arm32/bus_dma.c
-
 device	psci
 file	arch/arm/arm/psci.c			psci
 file	arch/arm/arm/psci_arm.S			psci
@@ -87,7 +83,10 @@ file	arch/aarch64/aarch64/bus_space_asm_
 file	arch/aarch64/aarch64/bus_space_notimpl.S
 
 # Standard files
+file	arch/arm/arm/arm_cpu_topology.c
+file	arch/arm/arm/arm_generic_dma.c
 file	arch/arm/arm/bootconfig.c
+file	arch/arm/arm32/bus_dma.c
 file	arch/aarch64/aarch64/aarch64_machdep.c
 file	arch/aarch64/aarch64/aarch64_reboot.c
 file	arch/aarch64/aarch64/core_machdep.c		coredump



CVS commit: src/sys/arch/powerpc/powerpc

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Tue Jan 21 04:30:14 UTC 2020

Modified Files:
src/sys/arch/powerpc/powerpc: lock_stubs.S

Log Message:
Update for changes to  -- owner field is now bits 5-N.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/powerpc/lock_stubs.S

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/powerpc/lock_stubs.S
diff -u src/sys/arch/powerpc/powerpc/lock_stubs.S:1.10 src/sys/arch/powerpc/powerpc/lock_stubs.S:1.11
--- src/sys/arch/powerpc/powerpc/lock_stubs.S:1.10	Fri Feb 28 05:38:15 2014
+++ src/sys/arch/powerpc/powerpc/lock_stubs.S	Tue Jan 21 04:30:14 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock_stubs.S,v 1.10 2014/02/28 05:38:15 matt Exp $	*/
+/*	$NetBSD: lock_stubs.S,v 1.11 2020/01/21 04:30:14 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -101,8 +101,8 @@ ENTRY(mutex_exit)
 /*
  * void rw_enter(krwlock_t *krw, krw_t op);
  */
-#if RW_READ_INCR != 16
-#error RW_READ_INCR != 16, clrrXi need fixing
+#if RW_READ_INCR != 32
+#error RW_READ_INCR != 32, clrrXi need fixing
 #endif
 #if RW_OWNER != 0
 #error RW_OWNER != 0, ldptr should be ldptru
@@ -115,7 +115,7 @@ ENTRY(rw_enter)
 	bne-	1f
 
 	ldptr	%r9,RW_OWNER(%r3)
-	clrrptri %r9,%r9,4		/* clear low 4 bits */
+	clrrptri %r9,%r9,5		/* clear low 5 bits */
 	addi	%r7,%r9,RW_READ_INCR
 	b	2f
 1:
@@ -140,7 +140,7 @@ ENTRY(rw_tryenter)
 	bne-	1f
 
 	ldptr	%r9,RW_OWNER(%r3)
-	clrrptri %r9,%r9,4		/* clear low 4 bits */
+	clrrptri %r9,%r9,5		/* clear low 5 bits */
 	addi	%r7,%r9,RW_READ_INCR
 	b	2f
 
@@ -169,7 +169,7 @@ ENTRY(rw_exit)
 	andi.	%r0,%r9,RW_WRITE_LOCKED
 	bne-	1f
 
-	clrrptri. %r9,%r9,4		/* clear low 4 bits */
+	clrrptri. %r9,%r9,5		/* clear low 5 bits */
 	beq-	3f			/* if 0, no reader, go slow */
 
 	addi	%r7,%r9,-RW_READ_INCR



CVS commit: src/sys/sys

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Tue Jan 21 04:09:11 UTC 2020

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

Log Message:
Update a comment.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/rwlock.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/rwlock.h
diff -u src/sys/sys/rwlock.h:1.13 src/sys/sys/rwlock.h:1.14
--- src/sys/sys/rwlock.h:1.13	Sun Jan 19 18:34:24 2020
+++ src/sys/sys/rwlock.h	Tue Jan 21 04:09:10 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: rwlock.h,v 1.13 2020/01/19 18:34:24 ad Exp $	*/
+/*	$NetBSD: rwlock.h,v 1.14 2020/01/21 04:09:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -63,10 +63,10 @@ typedef struct krwlock krwlock_t;
  * WRITE_LOCKED bit is clear, then the owner field is actually a count of
  * the number of readers.  The rw_owner field is laid out like so:
  *
- *	 N43210
- *	+-+
- *	| owner or read count | nodbug | wrlock | wrwant |  wait  |
- *	+-+
+ *  N 543210
+ *  +--+
+ *  | owner or read count | nodbug |  | wrlock | wrwant |  wait  |
+ *  +--+
  */
 #define	RW_HAS_WAITERS		0x01UL	/* lock has waiters */
 #define	RW_WRITE_WANTED		0x02UL	/* >= 1 waiter is a writer */



CVS commit: src/distrib/sets/lists/man

2020-01-20 Thread Takahiro Kambe
Module Name:src
Committed By:   taca
Date:   Tue Jan 21 03:29:56 UTC 2020

Modified Files:
src/distrib/sets/lists/man: mi

Log Message:
Revive entries for uyurex(4) as obsolete.


To generate a diff of this commit:
cvs rdiff -u -r1.1675 -r1.1676 src/distrib/sets/lists/man/mi

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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1675 src/distrib/sets/lists/man/mi:1.1676
--- src/distrib/sets/lists/man/mi:1.1675	Mon Jan 20 18:38:18 2020
+++ src/distrib/sets/lists/man/mi	Tue Jan 21 03:29:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1675 2020/01/20 18:38:18 thorpej Exp $
+# $NetBSD: mi,v 1.1676 2020/01/21 03:29:56 taca Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1928,6 +1928,7 @@
 ./usr/share/man/cat4/uvisor.0			man-sys-catman		.cat
 ./usr/share/man/cat4/uvscom.0			man-sys-catman		.cat
 ./usr/share/man/cat4/uyap.0			man-sys-catman		.cat
+./usr/share/man/cat4/uyurex.0			man-obsolete		obsolete
 ./usr/share/man/cat4/vald.0			man-sys-catman		.cat
 ./usr/share/man/cat4/valz.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/acc.0			man-sys-catman		.cat
@@ -5036,6 +5037,7 @@
 ./usr/share/man/html4/uvisor.html		man-sys-htmlman		html
 ./usr/share/man/html4/uvscom.html		man-sys-htmlman		html
 ./usr/share/man/html4/uyap.html			man-sys-htmlman		html
+./usr/share/man/html4/uyurex.html		man-obsolete		obsolete
 ./usr/share/man/html4/vald.html			man-sys-htmlman		html
 ./usr/share/man/html4/valz.html			man-sys-htmlman		html
 ./usr/share/man/html4/vax/acc.html		man-sys-htmlman		html
@@ -8068,6 +8070,7 @@
 ./usr/share/man/man4/uvisor.4			man-sys-man		.man
 ./usr/share/man/man4/uvscom.4			man-sys-man		.man
 ./usr/share/man/man4/uyap.4			man-sys-man		.man
+./usr/share/man/man4/uyurex.4			man-obsolete		obsolete
 ./usr/share/man/man4/vald.4			man-sys-man		.man
 ./usr/share/man/man4/valz.4			man-sys-man		.man
 ./usr/share/man/man4/vax/acc.4			man-sys-man		.man



CVS commit: src/sys

2020-01-20 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Jan 21 02:38:26 UTC 2020

Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.314 -r1.315 src/sys/kern/syscalls.c
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.112 -r1.113 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.143 -r1.144 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.308 -r1.309 src/sys/sys/syscall.h
cvs rdiff -u -r1.292 -r1.293 src/sys/sys/syscallargs.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/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.326 src/sys/kern/init_sysent.c:1.327
--- src/sys/kern/init_sysent.c:1.326	Mon Oct 21 14:23:53 2019
+++ src/sys/kern/init_sysent.c	Tue Jan 21 02:38:25 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.326 2019/10/21 14:23:53 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.327 2020/01/21 02:38:25 pgoyette Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.297 2020/01/21 02:37:16 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.326 2019/10/21 14:23:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.327 2020/01/21 02:38:25 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"

Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.314 src/sys/kern/syscalls.c:1.315
--- src/sys/kern/syscalls.c:1.314	Sun Sep 22 23:03:20 2019
+++ src/sys/kern/syscalls.c	Tue Jan 21 02:38:25 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.314 2019/09/22 23:03:20 christos Exp $ */
+/* $NetBSD: syscalls.c,v 1.315 2020/01/21 02:38:25 pgoyette Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.297 2020/01/21 02:37:16 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.314 2019/09/22 23:03:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.315 2020/01/21 02:38:25 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #ifdef _KERNEL_OPT

Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.31 src/sys/kern/syscalls_autoload.c:1.32
--- src/sys/kern/syscalls_autoload.c:1.31	Sun Sep 22 23:03:20 2019
+++ src/sys/kern/syscalls_autoload.c	Tue Jan 21 02:38:25 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.31 2019/09/22 23:03:20 christos Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.32 2020/01/21 02:38:25 pgoyette Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.296 2019/09/22 22:59:39 christos Exp
+ * created from	NetBSD: syscalls.master,v 1.297 2020/01/21 02:37:16 pgoyette Exp
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.31 2019/09/22 23:03:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.32 2020/01/21 02:38:25 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -77,7 +77,7 @@ static struct sc_autoload netbsd_syscall
 	{ SYS_compat_43_ogetrlimit, "compat_43" },
 	{ SYS_compat_43_osetrlimit, "compat_43" },
 	{ SYS_compat_43_okillpg, "compat_43" },
-	{ SYS_compat_50_quotactl, "compat_50" },
+	{ SYS_compat_50_quotactl, "compat_50_quota" },
 	{ SYS_compat_43_oquota, "compat_43" },
 	{ SYS_compat_43_ogetsockname, "compat_43" },
 	{ SYS_nfssvc, "nfsserver" },

Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.33 src/sys/kern/systrace_args.c:1.34
--- src/sys/kern/systrace_args.c:1.33	Sun Sep 22 23:03:20 2019
+++ src/sys/kern/systrace_args.c	Tue Jan 21 02:38:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.33 2019/09/22 23:03:20 christos Exp $ */
+/* $NetBSD: systrace_args.c,v 1.34 2020/01/21 02:38:25 pgoyette Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.

Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.112 src/sys/rump/include/rump/rump_syscalls.h:1.113
--- src/sys/rump/include/rump/rump_syscalls.h:1.112	Sun Sep 22 23:03:20 2019
+++ src/sys/rump/include/rump/rump_syscalls.h	Tue Jan 21 02:38:26 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.112 2019/09/22 23:03:20 

CVS commit: src

2020-01-20 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Jan 21 02:37:17 UTC 2020

Modified Files:
src/distrib/sets/lists/modules: mi
src/sys/compat/common: files.common vfs_syscalls_50.c
src/sys/kern: syscalls.master
src/sys/modules: Makefile
src/sys/modules/compat_50: Makefile
src/sys/sys: param.h
Added Files:
src/sys/compat/common: compat_50_quota.c
src/sys/modules/compat_50_quota: Makefile

Log Message:
Split the compat_50 module into two, separating the QUOTA-related
stuff from the rest of the module.  This allows loading of the
(main) compat_50 module on kernels that don't include ``options
QUOTA''.

Welcome to 9.99.40 !

Addresses PR kern/54875


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r0 -r1.1 src/sys/compat/common/compat_50_quota.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/common/files.common
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/common/vfs_syscalls_50.c
cvs rdiff -u -r1.296 -r1.297 src/sys/kern/syscalls.master
cvs rdiff -u -r1.236 -r1.237 src/sys/modules/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_50/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/compat_50_quota/Makefile
cvs rdiff -u -r1.642 -r1.643 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/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.130 src/distrib/sets/lists/modules/mi:1.131
--- src/distrib/sets/lists/modules/mi:1.130	Sun Jan 19 01:25:03 2020
+++ src/distrib/sets/lists/modules/mi	Tue Jan 21 02:37:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.130 2020/01/19 01:25:03 thorpej Exp $
+# $NetBSD: mi,v 1.131 2020/01/21 02:37:16 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -94,6 +94,8 @@
 ./@MODULEDIR@/compat_43/compat_43.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_50base-kernel-modules	kmod
 ./@MODULEDIR@/compat_50/compat_50.kmod		base-kernel-modules	kmod
+./@MODULEDIR@/compat_50_quota			base-kernel-modules	kmod
+./@MODULEDIR@/compat_50_quota/compat_50_quota.kmod base-kernel-modules	kmod
 ./@MODULEDIR@/compat_60base-kernel-modules	kmod
 ./@MODULEDIR@/compat_60/compat_60.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_70base-kernel-modules	kmod

Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.5 src/sys/compat/common/files.common:1.6
--- src/sys/compat/common/files.common:1.5	Sun Sep 22 22:59:38 2019
+++ src/sys/compat/common/files.common	Tue Jan 21 02:37:16 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.common,v 1.5 2019/09/22 22:59:38 christos Exp $
+#	$NetBSD: files.common,v 1.6 2020/01/21 02:37:16 pgoyette Exp $
 
 #
 # Generic utility files, used by various compat options.
@@ -80,6 +80,7 @@ file	compat/common/kern_select_50.c		com
 file	compat/common/rndpseudo_50.c		compat_50
 file	compat/common/rtsock_50.c		compat_50
 file	compat/common/vfs_syscalls_50.c		compat_50
+file	compat/common/compat_50_quota.c		compat_50 & quota
 file	compat/common/uipc_syscalls_50.c	compat_50
 file	compat/common/vnd_50.c			compat_50
 file	compat/common/clockctl_50.c		compat_50

Index: src/sys/compat/common/vfs_syscalls_50.c
diff -u src/sys/compat/common/vfs_syscalls_50.c:1.24 src/sys/compat/common/vfs_syscalls_50.c:1.25
--- src/sys/compat/common/vfs_syscalls_50.c:1.24	Sun Dec 15 16:48:26 2019
+++ src/sys/compat/common/vfs_syscalls_50.c	Tue Jan 21 02:37:16 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_syscalls_50.c,v 1.24 2019/12/15 16:48:26 tsutsui Exp $	*/
+/*	$NetBSD: vfs_syscalls_50.c,v 1.25 2020/01/21 02:37:16 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.24 2019/12/15 16:48:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.25 2020/01/21 02:37:16 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -62,12 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls
 
 #include 
 
-#ifdef QUOTA
-#include 
-#include 
-#include 
-#endif
-
 #include 
 #include 
 #include 
@@ -88,9 +82,6 @@ static const struct syscall_package vfs_
 	{ SYS_compat_50_futimes, 0, (sy_call_t *)compat_50_sys_futimes },
 	{ SYS_compat_50_lutimes, 0, (sy_call_t *)compat_50_sys_lutimes },
 	{ SYS_compat_50_mknod, 0, (sy_call_t *)compat_50_sys_mknod },
-#ifdef QUOTA
-	{ SYS_compat_50_quotactl, 0, (sy_call_t *)compat_50_sys_quotactl },
-#endif
 	{ 0, 0, NULL }
 };
 
@@ -339,118 +330,6 @@ compat_50_sys_mknod(struct lwp *l,
 	SCARG(uap, dev), UIO_USERSPACE);
 }
 
-#ifdef QUOTA
-/* ARGSUSED */
-int   
-compat_50_sys_quotactl(struct lwp *l, const struct compat_50_sys_quotactl_args *uap, register_t *retval)
-{
-	/* {
-		syscallarg(const char *) path;
-		syscallarg(int) cmd;
-		syscallarg(int) uid;
-		syscallarg(void 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

2020-01-20 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 20 23:22:09 UTC 2020

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_gart.c

Log Message:
add missing memset in radeon_gart_table_ram_alloc


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.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/external/bsd/drm2/dist/drm/radeon/radeon_gart.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.10 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c:1.10	Mon Aug 27 13:56:22 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_gart.c	Mon Jan 20 23:22:09 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_gart.c,v 1.10 2018/08/27 13:56:22 riastradh Exp $	*/
+/*	$NetBSD: radeon_gart.c,v 1.11 2020/01/20 23:22:09 jmcneill Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
  *  Jerome Glisse
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_gart.c,v 1.10 2018/08/27 13:56:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_gart.c,v 1.11 2020/01/20 23:22:09 jmcneill Exp $");
 
 #include 
 #include 
@@ -93,6 +93,8 @@ int radeon_gart_table_ram_alloc(struct r
 	if (error)
 		goto fail3;
 
+	memset((void *)rdev->gart.ptr, 0, rdev->gart.table_size);
+
 	/* Success!  */
 	rdev->gart.table_addr = rdev->gart.rg_table_map->dm_segs[0].ds_addr;
 	return 0;



CVS commit: src/sys/arch/evbarm

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Jan 20 22:25:07 UTC 2020

Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
src/sys/arch/evbarm/imx7: imx7_machdep.c
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c

Log Message:
Fix indentation


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/imx7/imx7_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.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/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.21 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.22
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.21	Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c	Mon Jan 20 22:25:07 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcm53xx_machdep.c,v 1.21 2019/07/16 14:41:44 skrll Exp $	*/
+/*	$NetBSD: bcm53xx_machdep.c,v 1.22 2020/01/20 22:25:07 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #define IDM_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.21 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.22 2020/01/20 22:25:07 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -256,7 +256,7 @@ bcm53xx_mpstart(void)
 	}
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		if ((arm_cpu_hatched & __BIT(i)) == 0) {
-		printf("%s: warning: cpu%zu failed to hatch\n",
+			printf("%s: warning: cpu%zu failed to hatch\n",
 			__func__, i);
 		}
 	}

Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.80 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.81
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.80	Sat Nov 23 18:03:57 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c	Mon Jan 20 22:25:07 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: beagle_machdep.c,v 1.80 2019/11/23 18:03:57 martin Exp $ */
+/*	$NetBSD: beagle_machdep.c,v 1.81 2020/01/20 22:25:07 skrll Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.80 2019/11/23 18:03:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.81 2020/01/20 22:25:07 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -498,7 +498,7 @@ beagle_mpstart(void)
 	}
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		if ((arm_cpu_hatched & __BIT(i)) == 0) {
-		printf("%s: warning: cpu%zu failed to hatch\n",
+			printf("%s: warning: cpu%zu failed to hatch\n",
 			__func__, i);
 		}
 	}

Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.63 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.64
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.63	Tue Jul 16 14:41:45 2019
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c	Mon Jan 20 22:25:07 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstix_machdep.c,v 1.63 2019/07/16 14:41:45 skrll Exp $ */
+/*	$NetBSD: gumstix_machdep.c,v 1.64 2020/01/20 22:25:07 skrll Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -546,7 +546,7 @@ gumstix_mpstart(void)
 	}
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		if ((arm_cpu_hatched & __BIT(i)) == 0) {
-		printf("%s: warning: cpu%zu failed to hatch\n",
+			printf("%s: warning: cpu%zu failed to hatch\n",
 			__func__, i);
 		}
 	}

Index: src/sys/arch/evbarm/imx7/imx7_machdep.c
diff -u src/sys/arch/evbarm/imx7/imx7_machdep.c:1.11 src/sys/arch/evbarm/imx7/imx7_machdep.c:1.12
--- src/sys/arch/evbarm/imx7/imx7_machdep.c:1.11	Tue Jul 16 14:41:46 2019
+++ src/sys/arch/evbarm/imx7/imx7_machdep.c	Mon Jan 20 22:25:07 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx7_machdep.c,v 1.11 2019/07/16 14:41:46 skrll Exp $	*/
+/*	$NetBSD: imx7_machdep.c,v 1.12 2020/01/20 22:25:07 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.11 2019/07/16 14:41:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.12 2020/01/20 22:25:07 skrll Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -220,7 +220,7 @@ imx7_mpstart(void)
 	}
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		if ((arm_cpu_hatched & __BIT(i)) == 0) {
-		printf("%s: warning: cpu%zu failed to hatch\n",
+			printf("%s: warning: cpu%zu failed to hatch\n",
 			__func__, i);
 		

CVS commit: src/sys/conf

2020-01-20 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Jan 20 22:18:39 UTC 2020

Modified Files:
src/sys/conf: files

Log Message:
COMPAT_43 requires COMPAT_60


To generate a diff of this commit:
cvs rdiff -u -r1.1253 -r1.1254 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1253 src/sys/conf/files:1.1254
--- src/sys/conf/files:1.1253	Mon Jan 20 18:38:21 2020
+++ src/sys/conf/files	Mon Jan 20 22:18:39 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1253 2020/01/20 18:38:21 thorpej Exp $
+#	$NetBSD: files,v 1.1254 2020/01/20 22:18:39 pgoyette Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -160,7 +160,7 @@ defflag	opt_compat_netbsd.h	COMPAT_11: C
 defflag	opt_compat_netbsd.h	COMPAT_10: COMPAT_11, COMPAT_NETBSD
 defflag	opt_compat_netbsd.h	COMPAT_09: COMPAT_10, COMPAT_NETBSD
 defflagCOMPAT_OSSAUDIO
-defflagCOMPAT_43
+defflagCOMPAT_43: COMPAT_60
 defflagCOMPAT_FREEBSD: COMPAT_09, COMPAT_43
 defflagCOMPAT_LINUX: COMPAT_NETBSD, COMPAT_43
 defflagCOMPAT_SUNOS: COMPAT_09, COMPAT_43



CVS commit: src/sys/arch/arm

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Jan 20 22:13:58 UTC 2020

Modified Files:
src/sys/arch/arm/arm32: cpu.c
src/sys/arch/arm/include: cpu.h
src/sys/arch/arm/include/arm32: pmap.h

Log Message:
s/_ARM_ARCH_6/ARM_MMU_EXTENDED/ in the #ifdef for the recent 4k pages
change


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/arm/include/arm32/pmap.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/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.141 src/sys/arch/arm/arm32/cpu.c:1.142
--- src/sys/arch/arm/arm32/cpu.c:1.141	Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/arm32/cpu.c	Mon Jan 20 22:13:57 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.141 2020/01/18 14:40:04 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.142 2020/01/20 22:13:57 skrll Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 #include "opt_multiprocessor.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.141 2020/01/18 14:40:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.142 2020/01/20 22:13:57 skrll Exp $");
 
 #include 
 #include 
@@ -887,7 +887,7 @@ identify_features(device_t dv)
 	cpu_processor_features[0], cpu_processor_features[1]);
 }
 
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
 int
 cpu_maxproc_hook(int nmaxproc)
 {

Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.105 src/sys/arch/arm/include/cpu.h:1.106
--- src/sys/arch/arm/include/cpu.h:1.105	Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/include/cpu.h	Mon Jan 20 22:13:57 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.105 2020/01/18 14:40:04 skrll Exp $	*/
+/*	$NetBSD: cpu.h,v 1.106 2020/01/20 22:13:57 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -329,7 +329,7 @@ vaddr_t cpu_uarea_alloc_idlelwp(struct c
  */
 void	cpu_attach(device_t, cpuid_t);
 
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
 int	cpu_maxproc_hook(int);
 #endif
 

Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.159 src/sys/arch/arm/include/arm32/pmap.h:1.160
--- src/sys/arch/arm/include/arm32/pmap.h:1.159	Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/include/arm32/pmap.h	Mon Jan 20 22:13:58 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.159 2020/01/18 14:40:04 skrll Exp $	*/
+/*	$NetBSD: pmap.h,v 1.160 2020/01/20 22:13:58 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -383,7 +383,7 @@ bool	pmap_extract(pmap_t, vaddr_t, paddr
 void	pmap_prefer(vaddr_t, vaddr_t *, int);
 #endif
 
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
 int	pmap_maxproc_set(int);
 #endif
 



CVS commit: src/usr.bin/quota

2020-01-20 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Mon Jan 20 21:38:30 UTC 2020

Modified Files:
src/usr.bin/quota: quota.1

Log Message:
...and it seems that -d is no longer restricted to root.

(No particular reason it should be; I suspect this changed when we got
real quota plumbing as historically -d would have been a special case
of asking about another user.)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/quota/quota.1

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/quota/quota.1
diff -u src/usr.bin/quota/quota.1:1.21 src/usr.bin/quota/quota.1:1.22
--- src/usr.bin/quota/quota.1:1.21	Mon Jan 20 21:35:41 2020
+++ src/usr.bin/quota/quota.1	Mon Jan 20 21:38:29 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: quota.1,v 1.21 2020/01/20 21:35:41 dholland Exp $
+.\"	$NetBSD: quota.1,v 1.22 2020/01/20 21:38:29 dholland Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -99,10 +99,6 @@ argument with the
 .Fl g
 flag to view only the limits of groups they belong to.
 .Pp
-Only the super-user may use the
-.Fl d
-flag.
-.Pp
 The
 .Fl q
 flag takes precedence over the



CVS commit: src/usr.bin/quota

2020-01-20 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Mon Jan 20 21:35:41 UTC 2020

Modified Files:
src/usr.bin/quota: quota.1

Log Message:
Document the actual behavior of -g; clarify the optional user/group args.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/quota/quota.1

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/quota/quota.1
diff -u src/usr.bin/quota/quota.1:1.20 src/usr.bin/quota/quota.1:1.21
--- src/usr.bin/quota/quota.1:1.20	Mon Jan 20 21:30:41 2020
+++ src/usr.bin/quota/quota.1	Mon Jan 20 21:35:41 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: quota.1,v 1.20 2020/01/20 21:30:41 dholland Exp $
+.\"	$NetBSD: quota.1,v 1.21 2020/01/20 21:35:41 dholland Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -66,7 +66,8 @@ Options:
 Query the kernel for default user or group quota instead of a specific
 user or group.
 .It Fl g
-Print group quotas for the group of which the user is a member.
+Print group quotas.
+By default, print group quotas for all groups the user belongs to.
 .It Fl h
 Numbers are displayed in a human readable format.
 .It Fl q
@@ -87,16 +88,16 @@ and
 displays both the user quotas and the group quotas (for
 the user).
 .Pp
-Only the super-user may use the
-.Fl u
-flag and the optional
+Only the super-user may use the optional
 .Ar user
-argument to view the limits of other users.
-Non-super-users can use the
-.Fl g
-flag and optional
+argument with the
+.Fl u
+flag to view quotas for other users.
+Non-super-users can use the optional
 .Ar group
-argument to view only the limits of groups of which they are members.
+argument with the
+.Fl g
+flag to view only the limits of groups they belong to.
 .Pp
 Only the super-user may use the
 .Fl d



CVS commit: src/usr.bin/quota

2020-01-20 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Mon Jan 20 21:30:41 UTC 2020

Modified Files:
src/usr.bin/quota: quota.1

Log Message:
Clarify -u.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/quota/quota.1

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/quota/quota.1
diff -u src/usr.bin/quota/quota.1:1.19 src/usr.bin/quota/quota.1:1.20
--- src/usr.bin/quota/quota.1:1.19	Sat May 12 21:43:09 2012
+++ src/usr.bin/quota/quota.1	Mon Jan 20 21:30:41 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: quota.1,v 1.19 2012/05/12 21:43:09 wiz Exp $
+.\"	$NetBSD: quota.1,v 1.20 2020/01/20 21:30:41 dholland Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd May 12, 2012
+.Dd Jan 20, 2020
 .Dt QUOTA 1
 .Os
 .Sh NAME
@@ -67,14 +67,14 @@ Query the kernel for default user or gro
 user or group.
 .It Fl g
 Print group quotas for the group of which the user is a member.
-The optional
-.Fl u
-flag is equivalent to the default.
 .It Fl h
 Numbers are displayed in a human readable format.
 .It Fl q
 Print a more terse message, containing only information
 on file systems where usage is over quota.
+.It Fl u
+Print user quotas.
+This is the default.
 .It Fl v
 .Nm
 will display quotas on file systems where no storage is allocated.



CVS commit: src/usr.sbin/sysinst

2020-01-20 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Jan 20 21:26:35 UTC 2020

Modified Files:
src/usr.sbin/sysinst: README.md_defs bsddisklabel.c defs.h disklabel.c
mbr.c part_edit.c util.c
src/usr.sbin/sysinst/arch/evbarm: md.c md.h

Log Message:
First try to bring evbarm installation closer to current reality.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/README.md_defs
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/sysinst/mbr.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/part_edit.c
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/sysinst/util.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbarm/md.h

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

Modified files:

Index: src/usr.sbin/sysinst/README.md_defs
diff -u src/usr.sbin/sysinst/README.md_defs:1.3 src/usr.sbin/sysinst/README.md_defs:1.4
--- src/usr.sbin/sysinst/README.md_defs:1.3	Tue Dec 10 06:25:50 2019
+++ src/usr.sbin/sysinst/README.md_defs	Mon Jan 20 21:26:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: README.md_defs,v 1.3 2019/12/10 06:25:50 isaki Exp $ */
+/* $NetBSD: README.md_defs,v 1.4 2020/01/20 21:26:35 martin Exp $ */
 
 The following is trying to document the most important machine dependent
 defines used in the sysinst code.
@@ -71,6 +71,24 @@ used like:
 returns true if this setup needs boot blocks. Used for example on x86
 when UEFI installs do not need any bootblocks, but BIOS ones do.
 
+MD_MAY_SWAP_TO		may be undefined
+
+used  like:
+
+	bool MD_MAY_SWAP_TO(const char *disk_name)
+
+returns true if the disk is usable as a swap device. Typical implementation
+in utils.c:may_swap_if_not_sdmmc.
+
+MD_SET_EXTRACT_FINALIZE	may be undefined
+
+used like:
+
+	int MD_SET_EXTRACT_FINALIZE(int update)
+
+extracts any additional parts of the distribution. Returns an error code
+if something fails.
+
 
 HAVE_PLAIN_DISKLABEL_BOOT	may be undefined, only used on architectures
 that have MBR as primary with disklabel as
@@ -90,3 +108,9 @@ If defined, do not verify the presence o
 offering the disklabel partitioning scheme. This allows ports to use
 kernel translation for the disklabel ioctls (e.g. x68k uses Human68k
 partitions this way).
+
+
+HAVE_GPT_BOOT			defined if the architecture can boot from GPT
+
+NO_DISKLABEL_BOOT		defined if the architecture can NOT boot
+from a disklabel partitioned disk

Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.35 src/usr.sbin/sysinst/bsddisklabel.c:1.36
--- src/usr.sbin/sysinst/bsddisklabel.c:1.35	Thu Jan 16 16:47:19 2020
+++ src/usr.sbin/sysinst/bsddisklabel.c	Mon Jan 20 21:26:35 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsddisklabel.c,v 1.35 2020/01/16 16:47:19 martin Exp $	*/
+/*	$NetBSD: bsddisklabel.c,v 1.36 2020/01/20 21:26:35 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -949,10 +949,28 @@ fill_defaults(struct partition_usage_set
 	for (i = 0; i < wanted->num; i++) {
 		wanted->infos[i].parts = parts;
 		wanted->infos[i].cur_part_id = NO_PART;
+		if (wanted->infos[i].type == PT_undef &&
+		wanted->infos[i].fs_type != FS_UNUSED) {
+			const struct part_type_desc *pt =
+			parts->pscheme->get_fs_part_type(PT_undef,
+			wanted->infos[i].fs_type,
+			wanted->infos[i].fs_version);
+			if (pt != NULL)
+wanted->infos[i].type = pt->generic_ptype;
+		}
+		if (wanted->parts->parent != NULL &&
+		wanted->infos[i].fs_type == FS_MSDOS)
+			wanted->infos[i].flags |=
+			PUIFLG_ADD_INNER|PUIFLAG_ADD_OUTER;
 
 #if DEFSWAPSIZE == -1
-		if (wanted->infos[i].type == PT_swap)
-			wanted->infos[i].size = get_ramsize() * (MEG / 512);
+		if (wanted->infos[i].type == PT_swap) {
+#ifdef	MD_MAY_SWAP_TO
+			if (MD_MAY_SWAP_TO(wanted->parts->disk))
+#endif
+wanted->infos[i].size =
+get_ramsize() * (MEG / 512);
+		}
 #endif
 		if (wanted->infos[i].type == PT_swap && swap > wanted->num)
 			swap = i;
@@ -988,7 +1006,8 @@ fill_defaults(struct partition_usage_set
 	 * empty disk. Merge the partitions in target range that are already
 	 * there (match with wanted) or are there additionaly.
 	 * The only thing outside of target range that we care for
-	 * is a potential swap partition - we assume one is enough.
+	 * are FAT partitions and a potential swap partition - we assume one
+	 * is enough.
 	 */
 	size_t num = wanted->num;
 	if (parts->parent) {
@@ -998,7 +1017,8 @@ fill_defaults(struct partition_usage_set
 			if (!parts->parent->pscheme->get_part_info(
 			parts->parent, pno, ))
 continue;
-			if (info.nat_type->generic_ptype != PT_swap)
+			if (info.nat_type->generic_ptype != PT_swap &&
+			info.fs_type != FS_MSDOS)
 continue;
 			

CVS commit: src/sys/dev/pci

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Mon Jan 20 19:45:27 UTC 2020

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

Log Message:
No longer need to go to splnet() before calling ifmedia_ioctl()
in the NET_MPSAFE; ifmedia_ioctl() will do this for us, if needed.


To generate a diff of this commit:
cvs rdiff -u -r1.658 -r1.659 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.658 src/sys/dev/pci/if_wm.c:1.659
--- src/sys/dev/pci/if_wm.c:1.658	Fri Dec 13 02:03:46 2019
+++ src/sys/dev/pci/if_wm.c	Mon Jan 20 19:45:27 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.658 2019/12/13 02:03:46 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.659 2020/01/20 19:45:27 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.658 2019/12/13 02:03:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.659 2020/01/20 19:45:27 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -3398,13 +3398,7 @@ wm_ioctl(struct ifnet *ifp, u_long cmd, 
 			sc->sc_flowflags = ifr->ifr_media & IFM_ETH_FMASK;
 		}
 		WM_CORE_UNLOCK(sc);
-#ifdef WM_MPSAFE
-		s = splnet();
-#endif
 		error = ifmedia_ioctl(ifp, ifr, >sc_mii.mii_media, cmd);
-#ifdef WM_MPSAFE
-		splx(s);
-#endif
 		break;
 	case SIOCINITIFADDR:
 		WM_CORE_LOCK(sc);



CVS commit: src/sys/net

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Mon Jan 20 19:35:39 UTC 2020

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

Log Message:
In ifmedia_ioctl(), go to splnet() before acquiring the KERNEL_LOCK.
For non-NET_MPSAFE, this is benign, because we can nest raising to
splnet().  For the NET_MPSAFE, it means that drivers don't need to
raise to splnet() just in order to call ifmedia_ioctl().


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/net/if_media.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_media.c
diff -u src/sys/net/if_media.c:1.48 src/sys/net/if_media.c:1.49
--- src/sys/net/if_media.c:1.48	Tue Oct  1 17:45:25 2019
+++ src/sys/net/if_media.c	Mon Jan 20 19:35:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_media.c,v 1.48 2019/10/01 17:45:25 chs Exp $	*/
+/*	$NetBSD: if_media.c,v 1.49 2020/01/20 19:35:39 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.48 2019/10/01 17:45:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.49 2020/01/20 19:35:39 thorpej Exp $");
 
 #include 
 #include 
@@ -362,12 +362,21 @@ ifmedia_ioctl(struct ifnet *ifp, struct 
 	int e;
 
 	/*
-	 * If if_is_mpsafe(ifp), KERNEL_LOCK isn't held here,
-	 * but ifmedia_ioctl_locked isn't MP-safe yet, so we must hold the lock.
+	 * If if_is_mpsafe(ifp), KERNEL_LOCK isn't held here and
+	 * ipl will not have been raised (well, maybe it has, but
+	 * it doesn't matter), but ifmedia_ioctl_locked isn't MP-safe
+	 * yet, so we go to splnet and grab the KERNEL_LOCK.
+	 *
+	 * In the non-mpsafe case, the interface's ioctl routine
+	 * will already be running at splnet() and so raising it
+	 * again is redundant, but also harmless.
 	 */
+	int s = splnet();
 	KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
 	e = ifmedia_ioctl_locked(ifp, ifr, ifm, cmd);
 	KERNEL_UNLOCK_IF_IFP_MPSAFE(ifp);
+	splx(s);
+
 	return e;
 }
 



CVS commit: src/sys/kern

2020-01-20 Thread Andrew Doran
Module Name:src
Committed By:   ad
Date:   Mon Jan 20 18:48:16 UTC 2020

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

Log Message:
PR kern/54880: -current hangs in mountroot

- Don't set the RW_NODEBUG flag on init, since assembly stubs can't handle it.
- rw_downgrade(): fix a case where the RW_NODEBUG flag was lost.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/kern/kern_rwlock.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/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.61 src/sys/kern/kern_rwlock.c:1.62
--- src/sys/kern/kern_rwlock.c:1.61	Sun Jan 19 18:34:24 2020
+++ src/sys/kern/kern_rwlock.c	Mon Jan 20 18:48:15 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_rwlock.c,v 1.61 2020/01/19 18:34:24 ad Exp $	*/
+/*	$NetBSD: kern_rwlock.c,v 1.62 2020/01/20 18:48:15 ad Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.61 2020/01/19 18:34:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.62 2020/01/20 18:48:15 ad Exp $");
 
 #include "opt_lockdebug.h"
 
@@ -206,10 +206,15 @@ void
 _rw_init(krwlock_t *rw, uintptr_t return_address)
 {
 
+#ifdef LOCKDEBUG
+	/* XXX only because the assembly stubs can't handle RW_NODEBUG */
 	if (LOCKDEBUG_ALLOC(rw, _lockops, return_address))
 		rw->rw_owner = 0;
 	else
 		rw->rw_owner = RW_NODEBUG;
+#else
+	rw->rw_owner = 0;
+#endif
 }
 
 void
@@ -645,7 +650,7 @@ rw_downgrade(krwlock_t *rw)
 			RW_ASSERT(rw, (rw->rw_owner & RW_HAS_WAITERS) != 0);
 
 			newown = owner & RW_NODEBUG;
-			newown = RW_READ_INCR | RW_HAS_WAITERS |
+			newown |= RW_READ_INCR | RW_HAS_WAITERS |
 			RW_WRITE_WANTED;
 			next = rw_cas(rw, owner, newown);
 			turnstile_exit(rw);



CVS commit: src/doc

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Mon Jan 20 18:40:06 UTC 2020

Modified Files:
src/doc: TODO.smpnet

Log Message:
FDDI support has been removed.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/doc/TODO.smpnet

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

Modified files:

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.33 src/doc/TODO.smpnet:1.34
--- src/doc/TODO.smpnet:1.33	Sun Jan 19 20:02:23 2020
+++ src/doc/TODO.smpnet	Mon Jan 20 18:40:06 2020
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.33 2020/01/19 20:02:23 thorpej Exp $
+$NetBSD: TODO.smpnet,v 1.34 2020/01/20 18:40:06 thorpej Exp $
 
 MP-safe components
 ==
@@ -62,7 +62,6 @@ Unprotected ones
  - Layer 2
- ARCNET (if_arcsubr.c)
- BRIDGE_IPF
-   - FDDI (if_fddisubr.c)
- IEEE 1394 (if_ieee1394subr.c)
- IEEE 802.11 (ieee80211(4))
  - Layer 3



CVS commit: src/doc

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Mon Jan 20 18:39:43 UTC 2020

Modified Files:
src/doc: CHANGES

Log Message:
Note removal of FDDI.


To generate a diff of this commit:
cvs rdiff -u -r1.2640 -r1.2641 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.2640 src/doc/CHANGES:1.2641
--- src/doc/CHANGES:1.2640	Sun Jan 19 20:01:49 2020
+++ src/doc/CHANGES	Mon Jan 20 18:39:43 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2640 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2641 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -102,3 +102,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	hippi and esh(4): Removed from the tree. [thorpej 20200118]
 	de(4): Removed from the tree. [thorpej 20200119]
 	token ring and tr(4): Removed from the tree. [20200119]
+	fddi, fpa(4), fta(4), fea(4): Removed from the tree. [20200120]



CVS commit: src

2020-01-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Mon Jan 20 18:38:22 UTC 2020

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
src/share/man/man9: Makefile ethersubr.9
src/sys/arch/algor/conf: P4032 P5064 P6032
src/sys/arch/alpha/conf: GENERIC INSTALL RAWHIDE
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/arc/conf: GENERIC
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/evbarm/conf: IXDP425 ZAO425
src/sys/arch/evbmips/conf: MALTA
src/sys/arch/evbppc/conf: PMPPC WALNUT
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY XEN3PAE_DOM0
src/sys/arch/macppc/conf: GENERIC
src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64
src/sys/arch/sgimips/conf: GENERIC32_IP3x
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/vax/conf: GENERIC INSTALL VAX780
src/sys/conf: files
src/sys/dev/eisa: files.eisa
src/sys/dev/pci: files.pci
src/sys/dev/tc: files.tc
src/sys/net: Makefile files.net if.c
src/sys/netinet: if_arp.c ip_carp.c
src/sys/netinet6: in6.c in6_ifattach.c nd6.c nd6_nbr.c
Removed Files:
src/share/man/man4: fpa.4
src/sys/dev/eisa: if_fea.c
src/sys/dev/ic: pdq.c pdq_ifsubr.c pdqreg.h pdqvar.h
src/sys/dev/pci: if_fpa.c
src/sys/dev/tc: if_fta.c
src/sys/net: if_fddi.h if_fddisubr.c

Log Message:
Remove FDDI support.


To generate a diff of this commit:
cvs rdiff -u -r1.2304 -r1.2305 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1674 -r1.1675 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.698 -r1.699 src/share/man/man4/Makefile
cvs rdiff -u -r1.15 -r0 src/share/man/man4/fpa.4
cvs rdiff -u -r1.444 -r1.445 src/share/man/man9/Makefile
cvs rdiff -u -r1.27 -r1.28 src/share/man/man9/ethersubr.9
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.398 -r1.399 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/alpha/conf/INSTALL
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/conf/RAWHIDE
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.557 -r1.558 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbppc/conf/WALNUT
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.484 -r1.485 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1221 -r1.1222 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.360 -r1.361 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/pmax/conf/INSTALL
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/pmax/conf/INSTALL64
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.221 -r1.222 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.211 -r1.212 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/vax/conf/INSTALL
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.1252 -r1.1253 src/sys/conf/files
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/eisa/files.eisa
cvs rdiff -u -r1.48 -r0 src/sys/dev/eisa/if_fea.c
cvs rdiff -u -r1.41 -r0 src/sys/dev/ic/pdq.c
cvs rdiff -u -r1.67 -r0 src/sys/dev/ic/pdq_ifsubr.c
cvs rdiff -u -r1.19 -r0 src/sys/dev/ic/pdqreg.h
cvs rdiff -u -r1.50 -r0 src/sys/dev/ic/pdqvar.h
cvs rdiff -u -r1.423 -r1.424 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.63 -r0 src/sys/dev/pci/if_fpa.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/tc/files.tc
cvs rdiff -u -r1.29 -r0 src/sys/dev/tc/if_fta.c
cvs rdiff -u -r1.40 -r1.41 src/sys/net/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/net/files.net
cvs rdiff -u -r1.467 -r1.468 src/sys/net/if.c
cvs rdiff -u -r1.14 -r0 src/sys/net/if_fddi.h
cvs rdiff -u 

CVS commit: src/sys/arch/arm/sunxi

2020-01-20 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Mon Jan 20 16:29:38 UTC 2020

Modified Files:
src/sys/arch/arm/sunxi: sun8i_crypto.c

Log Message:
Fix (presently harmless) psato.

Don't overwrite cy_root_node; use cy_trng_node as intended.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sunxi/sun8i_crypto.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/sunxi/sun8i_crypto.c
diff -u src/sys/arch/arm/sunxi/sun8i_crypto.c:1.10 src/sys/arch/arm/sunxi/sun8i_crypto.c:1.11
--- src/sys/arch/arm/sunxi/sun8i_crypto.c:1.10	Sun Jan 12 21:52:36 2020
+++ src/sys/arch/arm/sunxi/sun8i_crypto.c	Mon Jan 20 16:29:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: sun8i_crypto.c,v 1.10 2020/01/12 21:52:36 riastradh Exp $	*/
+/*	$NetBSD: sun8i_crypto.c,v 1.11 2020/01/20 16:29:38 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.10 2020/01/12 21:52:36 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.11 2020/01/20 16:29:38 riastradh Exp $");
 
 #include 
 #include 
@@ -1177,7 +1177,7 @@ sun8i_crypto_sysctl_attach(struct sun8i_
 	}
 
 	/* hw.sun8icryptoN.rng (`struct', 4096-byte array) */
-	sysctl_createv(>cy_log, 0, >cy_root_node, NULL,
+	sysctl_createv(>cy_log, 0, >cy_trng_node, NULL,
 	CTLFLAG_PERMANENT|CTLFLAG_READONLY|CTLFLAG_PRIVATE, CTLTYPE_STRUCT,
 	"rng", SYSCTL_DESCR("Read up to 4096 bytes out of the TRNG"),
 	_crypto_sysctl_rng, 0, sc, 0, CTL_CREATE, CTL_EOL);



CVS commit: src/share/man

2020-01-20 Thread Nia Alarie
Module Name:src
Committed By:   nia
Date:   Mon Jan 20 13:08:40 UTC 2020

Modified Files:
src/share/man/man5: networks.5
src/share/man/man7: setuid.7
src/share/man/man9: in_getifa.9 secmodel_extensions.9

Log Message:
when referring to the "user"/"operator"/"network manager": he -> they


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man5/networks.5
cvs rdiff -u -r1.7 -r1.8 src/share/man/man7/setuid.7
cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/in_getifa.9
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/secmodel_extensions.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/man5/networks.5
diff -u src/share/man/man5/networks.5:1.17 src/share/man/man5/networks.5:1.18
--- src/share/man/man5/networks.5:1.17	Fri Jul 13 21:44:32 2018
+++ src/share/man/man5/networks.5	Mon Jan 20 13:08:40 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: networks.5,v 1.17 2018/07/13 21:44:32 maya Exp $
+.\"	$NetBSD: networks.5,v 1.18 2020/01/20 13:08:40 nia Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -118,9 +118,9 @@ and assign addresses to its hosts from
 .Tn IP
 network address space given by the new
 .Tn ISP .
-Thus, it is best for a savvy network manager to configure his
-hosts for easy renumbering, to preserve his ability to easily
-change his
+Thus, it is best for a savvy network manager to configure their
+hosts for easy renumbering, to preserve their ability to easily
+change their
 .Tn ISP
 should the need arise.
 .Sh FILES

Index: src/share/man/man7/setuid.7
diff -u src/share/man/man7/setuid.7:1.7 src/share/man/man7/setuid.7:1.8
--- src/share/man/man7/setuid.7:1.7	Tue Mar 18 18:20:40 2014
+++ src/share/man/man7/setuid.7	Mon Jan 20 13:08:40 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: setuid.7,v 1.7 2014/03/18 18:20:40 riastradh Exp $
+.\" $NetBSD: setuid.7,v 1.8 2020/01/20 13:08:40 nia Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -309,7 +309,7 @@ The following are resource-exhaustion po
 program should respond properly to.
 .Bl -bullet
 .It
-The user might have used up all of his allowed processes, so
+The user might have used up all of their allowed processes, so
 any attempt to create a new one (via
 .Xr fork 2
 or

Index: src/share/man/man9/in_getifa.9
diff -u src/share/man/man9/in_getifa.9:1.9 src/share/man/man9/in_getifa.9:1.10
--- src/share/man/man9/in_getifa.9:1.9	Mon Jul  3 21:28:48 2017
+++ src/share/man/man9/in_getifa.9	Mon Jan 20 13:08:40 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: in_getifa.9,v 1.9 2017/07/03 21:28:48 wiz Exp $
+.\" $NetBSD: in_getifa.9,v 1.10 2020/01/20 13:08:40 nia Exp $
 .\"
 .\" Copyright (c) 2006 David Young.  All rights reserved.
 .\"
@@ -157,7 +157,7 @@ The kernel breaks ties by choosing the s
 .Pp
 The operator may set a policy on individual interfaces.
 The operator may also set a global policy that applies to all
-interfaces whose policy he does not set individually.
+interfaces whose policy they do not set individually.
 .Pp
 Here is the sysctl tree for the policy at system startup:
 .Pp

Index: src/share/man/man9/secmodel_extensions.9
diff -u src/share/man/man9/secmodel_extensions.9:1.5 src/share/man/man9/secmodel_extensions.9:1.6
--- src/share/man/man9/secmodel_extensions.9:1.5	Tue Mar 18 18:20:40 2014
+++ src/share/man/man9/secmodel_extensions.9	Mon Jan 20 13:08:40 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: secmodel_extensions.9,v 1.5 2014/03/18 18:20:40 riastradh Exp $
+.\" $NetBSD: secmodel_extensions.9,v 1.6 2020/01/20 13:08:40 nia Exp $
 .\"
 .\" Copyright (c) 2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -95,7 +95,7 @@ of the system is above 0.
 .Sh Non-superuser control of CPU sets
 When enabled, an ordinary user is allowed to control the CPU
 .Xr affinity 3
-of the processes and threads he owns.
+of the processes and threads they own.
 .Pp
 This extension is enabled by setting
 .Pa security.models.extensions.user_set_cpu_affinity



CVS commit: src/sys/arch/aarch64/aarch64

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Jan 20 12:32:04 UTC 2020

Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/aarch64/aarch64/cpu.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/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.34 src/sys/arch/aarch64/aarch64/cpu.c:1.35
--- src/sys/arch/aarch64/aarch64/cpu.c:1.34	Wed Jan 15 08:34:04 2020
+++ src/sys/arch/aarch64/aarch64/cpu.c	Mon Jan 20 12:32:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.34 2020/01/15 08:34:04 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.35 2020/01/20 12:32:04 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.34 2020/01/15 08:34:04 mrg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.35 2020/01/20 12:32:04 skrll Exp $");
 
 #include "locators.h"
 #include "opt_arm_debug.h"
@@ -35,13 +35,13 @@ __KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.34
 #include "opt_multiprocessor.h"
 
 #include 
-#include 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 



CVS commit: src/sys/uvm

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Jan 20 10:43:49 UTC 2020

Modified Files:
src/sys/uvm: uvm_km.c

Log Message:
Another #define protection.

PMAP_ALLOC_POOLPAGE expects PMAP_{,UN}MAP_POOLPAGE to be defined


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.152 src/sys/uvm/uvm_km.c:1.153
--- src/sys/uvm/uvm_km.c:1.152	Sat Dec 14 17:28:58 2019
+++ src/sys/uvm/uvm_km.c	Mon Jan 20 10:43:48 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_km.c,v 1.152 2019/12/14 17:28:58 ad Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.153 2020/01/20 10:43:48 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.152 2019/12/14 17:28:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.153 2020/01/20 10:43:48 skrll Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -775,6 +775,11 @@ uvm_km_free(struct vm_map *map, vaddr_t 
 #error Must specify MAP and UNMAP together.
 #endif
 
+#if defined(PMAP_ALLOC_POOLPAGE) && \
+!defined(PMAP_MAP_POOLPAGE) && !defined(PMAP_UNMAP_POOLPAGE)
+#error Must specify ALLOC with MAP and UNMAP
+#endif
+
 int
 uvm_km_kmem_alloc(vmem_t *vm, vmem_size_t size, vm_flag_t flags,
 vmem_addr_t *addr)



CVS commit: src/sys/dev/pci

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Jan 20 10:35:42 UTC 2020

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

Log Message:
don't attempt to extent_alloc_subregion outside the parent extent ranges


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/pciconf.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/pciconf.c
diff -u src/sys/dev/pci/pciconf.c:1.44 src/sys/dev/pci/pciconf.c:1.45
--- src/sys/dev/pci/pciconf.c:1.44	Sat Jan 18 22:17:34 2020
+++ src/sys/dev/pci/pciconf.c	Mon Jan 20 10:35:42 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciconf.c,v 1.44 2020/01/18 22:17:34 thorpej Exp $	*/
+/*	$NetBSD: pciconf.c,v 1.45 2020/01/20 10:35:42 skrll Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.44 2020/01/18 22:17:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.45 2020/01/20 10:35:42 skrll Exp $");
 
 #include "opt_pci.h"
 
@@ -1195,7 +1195,7 @@ mem_region_ok64(struct extent * const ex
 	 */
 	u_long addr64;
 	if (ex->ex_end > (1UL << 32) &&
-	extent_alloc_subregion(ex, (1UL << 32),
+	extent_alloc_subregion(ex, MAX((1UL << 32), ex->ex_start),
    ex->ex_end,
    1 /* size */,
    1 /* alignment */,