Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/ad-namecache]: src/sys Sync with head.
details: https://anonhg.NetBSD.org/src/rev/501774edbf11
branches: ad-namecache
changeset: 850558:501774edbf11
user: ad <ad%NetBSD.org@localhost>
date: Sat Feb 29 21:50:45 2020 +0000
description:
Sync with head.
diffstat:
sys/arch/arm/arm32/pmap.c | 6 ++----
sys/arch/i386/include/rwlock.h | 3 +++
sys/kern/kern_idle.c | 5 +++--
sys/kern/uipc_usrreq.c | 6 +++---
4 files changed, 11 insertions(+), 9 deletions(-)
diffs (80 lines):
diff -r d2c0fd5c956f -r 501774edbf11 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Sat Feb 29 20:17:42 2020 +0000
+++ b/sys/arch/arm/arm32/pmap.c Sat Feb 29 21:50:45 2020 +0000
@@ -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 @@
#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
diff -r d2c0fd5c956f -r 501774edbf11 sys/arch/i386/include/rwlock.h
--- a/sys/arch/i386/include/rwlock.h Sat Feb 29 20:17:42 2020 +0000
+++ b/sys/arch/i386/include/rwlock.h Sat Feb 29 21:50:45 2020 +0000
@@ -0,0 +1,3 @@
+/* $NetBSD: rwlock.h,v 1.2.144.2 2020/02/29 21:50:45 ad Exp $ */
+
+#include <x86/rwlock.h>
diff -r d2c0fd5c956f -r 501774edbf11 sys/kern/kern_idle.c
--- a/sys/kern/kern_idle.c Sat Feb 29 20:17:42 2020 +0000
+++ b/sys/kern/kern_idle.c Sat Feb 29 21:50:45 2020 +0000
@@ -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>
diff -r d2c0fd5c956f -r 501774edbf11 sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c Sat Feb 29 20:17:42 2020 +0000
+++ b/sys/kern/uipc_usrreq.c Sat Feb 29 21:50:45 2020 +0000
@@ -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 @@
}
}
}
-
+
restart:
/*
* First loop -- allocate file descriptor table slots for the
Home |
Main Index |
Thread Index |
Old Index