Module Name: src
Committed By: ad
Date: Sat Feb 29 21:50:45 UTC 2020
Modified Files:
src/sys/arch/arm/arm32 [ad-namecache]: pmap.c
src/sys/arch/i386/include [ad-namecache]: rwlock.h
src/sys/kern [ad-namecache]: kern_idle.c uipc_usrreq.c
Log Message:
Sync with head.
To generate a diff of this commit:
cvs rdiff -u -r1.375.2.3 -r1.375.2.4 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.2.144.1 -r1.2.144.2 src/sys/arch/i386/include/rwlock.h
cvs rdiff -u -r1.29.2.3 -r1.29.2.4 src/sys/kern/kern_idle.c
cvs rdiff -u -r1.194.4.2 -r1.194.4.3 src/sys/kern/uipc_usrreq.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/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.375.2.3 src/sys/arch/arm/arm32/pmap.c:1.375.2.4
--- src/sys/arch/arm/arm32/pmap.c:1.375.2.3 Sat Feb 29 20:18:17 2020
+++ src/sys/arch/arm/arm32/pmap.c Sat Feb 29 21:50:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.375.2.3 2020/02/29 20:18:17 ad Exp $ */
+/* $NetBSD: pmap.c,v 1.375.2.4 2020/02/29 21:50:45 ad Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -198,7 +198,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.375.2.3 2020/02/29 20:18:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.375.2.4 2020/02/29 21:50:45 ad Exp $");
#include <sys/atomic.h>
#include <sys/param.h>
@@ -224,8 +224,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.3
#include <arm/db_machdep.h>
#endif
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.375.2.3 2020/02/29 20:18:17 ad Exp $");
-
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
Index: src/sys/arch/i386/include/rwlock.h
diff -u src/sys/arch/i386/include/rwlock.h:1.2.144.1 src/sys/arch/i386/include/rwlock.h:1.2.144.2
--- src/sys/arch/i386/include/rwlock.h:1.2.144.1 Sun Jan 19 21:10:59 2020
+++ src/sys/arch/i386/include/rwlock.h Sat Feb 29 21:50:45 2020
@@ -0,0 +1,3 @@
+/* $NetBSD: rwlock.h,v 1.2.144.2 2020/02/29 21:50:45 ad Exp $ */
+
+#include <x86/rwlock.h>
Index: src/sys/kern/kern_idle.c
diff -u src/sys/kern/kern_idle.c:1.29.2.3 src/sys/kern/kern_idle.c:1.29.2.4
--- src/sys/kern/kern_idle.c:1.29.2.3 Sat Feb 29 20:21:02 2020
+++ src/sys/kern/kern_idle.c Sat Feb 29 21:50:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_idle.c,v 1.29.2.3 2020/02/29 20:21:02 ad Exp $ */
+/* $NetBSD: kern_idle.c,v 1.29.2.4 2020/02/29 21:50:45 ad Exp $ */
/*-
* Copyright (c)2002, 2006, 2007 YAMAMOTO Takashi,
@@ -27,7 +27,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_idle.c,v 1.29.2.3 2020/02/29 20:21:02 ad Exp $");
+
+__KERNEL_RCSID(0, "$NetBSD: kern_idle.c,v 1.29.2.4 2020/02/29 21:50:45 ad Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.194.4.2 src/sys/kern/uipc_usrreq.c:1.194.4.3
--- src/sys/kern/uipc_usrreq.c:1.194.4.2 Sat Feb 29 20:21:03 2020
+++ src/sys/kern/uipc_usrreq.c Sat Feb 29 21:50:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.194.4.2 2020/02/29 20:21:03 ad Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.194.4.3 2020/02/29 21:50:45 ad Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.194.4.2 2020/02/29 20:21:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.194.4.3 2020/02/29 21:50:45 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1431,7 +1431,7 @@ unp_externalize(struct mbuf *rights, str
}
}
}
-
+
restart:
/*
* First loop -- allocate file descriptor table slots for the
