[src/trunk]: src/sys Minimize unnecessary differences in rump.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7afdff9e514
branches:  trunk
changeset: 750754:d7afdff9e514
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Jan 13 01:53:38 2010 +0000

description:
Minimize unnecessary differences in rump.

diffstat:

 sys/kern/init_sysctl.c           |  6 +++---
 sys/kern/kern_sysctl.c           |  7 ++++---
 sys/rump/librump/rumpkern/emul.c |  6 ++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs (89 lines):

diff -r d4cbe1c5f3af -r d7afdff9e514 sys/kern/init_sysctl.c
--- a/sys/kern/init_sysctl.c    Wed Jan 13 01:23:06 2010 +0000
+++ b/sys/kern/init_sysctl.c    Wed Jan 13 01:53:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_sysctl.c,v 1.171 2009/12/24 19:01:12 elad Exp $ */
+/*     $NetBSD: init_sysctl.c,v 1.172 2010/01/13 01:53:38 pooka Exp $ */
 
 /*-
  * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.171 2009/12/24 19:01:12 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.172 2010/01/13 01:53:38 pooka Exp $");
 
 #include "opt_sysv.h"
 #include "opt_compat_netbsd32.h"
@@ -97,7 +97,7 @@
 mode_t security_setidcore_mode = (S_IRUSR|S_IWUSR);
 
 /* Initialized in sysctl_init() for now... */
-/* static */ kmutex_t sysctl_file_marker_lock;
+extern kmutex_t sysctl_file_marker_lock;
 static u_int sysctl_file_marker = 1;
 
 static const u_int sysctl_flagmap[] = {
diff -r d4cbe1c5f3af -r d7afdff9e514 sys/kern/kern_sysctl.c
--- a/sys/kern/kern_sysctl.c    Wed Jan 13 01:23:06 2010 +0000
+++ b/sys/kern/kern_sysctl.c    Wed Jan 13 01:53:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_sysctl.c,v 1.227 2009/12/24 19:01:12 elad Exp $   */
+/*     $NetBSD: kern_sysctl.c,v 1.228 2010/01/13 01:53:38 pooka Exp $  */
 
 /*-
  * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.227 2009/12/24 19:01:12 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.228 2010/01/13 01:53:38 pooka Exp $");
 
 #include "opt_defcorename.h"
 #include "ksyms.h"
@@ -141,6 +141,8 @@
  */
 krwlock_t sysctl_treelock;
 
+kmutex_t sysctl_file_marker_lock;
+
 /*
  * Attributes stored in the kernel.
  */
@@ -220,7 +222,6 @@
 sysctl_init(void)
 {
        sysctl_setup_func * const *sysctl_setup, f;
-       extern kmutex_t sysctl_file_marker_lock; /* in init_sysctl.c */
 
        rw_init(&sysctl_treelock);
 
diff -r d4cbe1c5f3af -r d7afdff9e514 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Wed Jan 13 01:23:06 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Wed Jan 13 01:53:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.117 2010/01/13 01:18:51 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.118 2010/01/13 01:53:38 pooka Exp $ */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.117 2010/01/13 01:18:51 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.118 2010/01/13 01:53:38 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -111,8 +111,6 @@
 
 kmutex_t tty_lock;
 
-kmutex_t sysctl_file_marker_lock;
-
 /* sparc doesn't sport constant page size */
 #ifdef __sparc__
 int nbpg = 4096;