Module Name: src
Committed By: pooka
Date: Wed Jan 13 01:53:38 UTC 2010
Modified Files:
src/sys/kern: init_sysctl.c kern_sysctl.c
src/sys/rump/librump/rumpkern: emul.c
Log Message:
Minimize unnecessary differences in rump.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.227 -r1.228 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.117 -r1.118 src/sys/rump/librump/rumpkern/emul.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/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.171 src/sys/kern/init_sysctl.c:1.172
--- src/sys/kern/init_sysctl.c:1.171 Thu Dec 24 19:01:12 2009
+++ src/sys/kern/init_sysctl.c Wed Jan 13 01:53:38 2010
@@ -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[] = {
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.227 src/sys/kern/kern_sysctl.c:1.228
--- src/sys/kern/kern_sysctl.c:1.227 Thu Dec 24 19:01:12 2009
+++ src/sys/kern/kern_sysctl.c Wed Jan 13 01:53:38 2010
@@ -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);
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.117 src/sys/rump/librump/rumpkern/emul.c:1.118
--- src/sys/rump/librump/rumpkern/emul.c:1.117 Wed Jan 13 01:18:51 2010
+++ src/sys/rump/librump/rumpkern/emul.c Wed Jan 13 01:53:38 2010
@@ -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;
