Module Name: src
Committed By: skrll
Date: Fri Feb 28 10:16:51 UTC 2014
Modified Files:
src/sys/arch/i386/i386: db_interface.c
src/sys/arch/prep/pnpbus: nvram_pnpbus.c
src/sys/arch/sparc/sparc: core_machdep.c db_interface.c machdep.c
src/sys/dev: fss.c fssvar.h
src/sys/dev/raidframe: raidframevar.h rf_threadstuff.h
src/sys/dev/spi: spivar.h
src/sys/kern: kern_synch.c
src/sys/rump/librump/rumpkern: rump.c
Log Message:
G/C sys/simplelock.h includes
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/i386/db_interface.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/prep/pnpbus/nvram_pnpbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/sparc/core_machdep.c
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sparc/sparc/db_interface.c
cvs rdiff -u -r1.325 -r1.326 src/sys/arch/sparc/sparc/machdep.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/fss.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/fssvar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/raidframe/raidframevar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_threadstuff.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/spi/spivar.h
cvs rdiff -u -r1.307 -r1.308 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.286 -r1.287 src/sys/rump/librump/rumpkern/rump.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/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.70 src/sys/arch/i386/i386/db_interface.c:1.71
--- src/sys/arch/i386/i386/db_interface.c:1.70 Sat Dec 8 14:40:10 2012
+++ src/sys/arch/i386/i386/db_interface.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.70 2012/12/08 14:40:10 jakllsch Exp $ */
+/* $NetBSD: db_interface.c,v 1.71 2014/02/28 10:16:51 skrll Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.70 2012/12/08 14:40:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.71 2014/02/28 10:16:51 skrll Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface
#include <sys/reboot.h>
#include <sys/systm.h>
#include <sys/atomic.h>
-#include <sys/simplelock.h>
#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/prep/pnpbus/nvram_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/nvram_pnpbus.c:1.17 src/sys/arch/prep/pnpbus/nvram_pnpbus.c:1.18
--- src/sys/arch/prep/pnpbus/nvram_pnpbus.c:1.17 Sat Oct 27 17:18:08 2012
+++ src/sys/arch/prep/pnpbus/nvram_pnpbus.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram_pnpbus.c,v 1.17 2012/10/27 17:18:08 chs Exp $ */
+/* $NetBSD: nvram_pnpbus.c,v 1.18 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram_pnpbus.c,v 1.17 2012/10/27 17:18:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram_pnpbus.c,v 1.18 2014/02/28 10:16:51 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: nvram_pnpbus
#include <sys/kthread.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/simplelock.h>
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/arch/sparc/sparc/core_machdep.c
diff -u src/sys/arch/sparc/sparc/core_machdep.c:1.6 src/sys/arch/sparc/sparc/core_machdep.c:1.7
--- src/sys/arch/sparc/sparc/core_machdep.c:1.6 Wed Jan 1 18:57:16 2014
+++ src/sys/arch/sparc/sparc/core_machdep.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: core_machdep.c,v 1.6 2014/01/01 18:57:16 dsl Exp $ */
+/* $NetBSD: core_machdep.c,v 1.7 2014/02/28 10:16:51 skrll Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.6 2014/01/01 18:57:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.7 2014/02/28 10:16:51 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,7 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: core_machdep
#include <sys/buf.h>
#include <sys/exec.h>
#include <sys/vnode.h>
-#include <sys/simplelock.h>
#include <sys/exec_aout.h>
Index: src/sys/arch/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.89 src/sys/arch/sparc/sparc/db_interface.c:1.90
--- src/sys/arch/sparc/sparc/db_interface.c:1.89 Sat Jul 9 15:02:49 2011
+++ src/sys/arch/sparc/sparc/db_interface.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.89 2011/07/09 15:02:49 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.90 2014/02/28 10:16:51 skrll Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.89 2011/07/09 15:02:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.90 2014/02/28 10:16:51 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/systm.h>
-#include <sys/simplelock.h>
#include <dev/cons.h>
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.325 src/sys/arch/sparc/sparc/machdep.c:1.326
--- src/sys/arch/sparc/sparc/machdep.c:1.325 Fri Nov 2 00:01:20 2012
+++ src/sys/arch/sparc/sparc/machdep.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.325 2012/11/02 00:01:20 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.326 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325 2012/11/02 00:01:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.326 2014/02/28 10:16:51 skrll Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -100,7 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/exec.h>
#include <sys/exec_aout.h>
#include <sys/ucontext.h>
-#include <sys/simplelock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/ras.h>
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.86 src/sys/dev/fss.c:1.87
--- src/sys/dev/fss.c:1.86 Wed Feb 13 14:03:48 2013
+++ src/sys/dev/fss.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.86 2013/02/13 14:03:48 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.87 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.86 2013/02/13 14:03:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.87 2014/02/28 10:16:51 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.86
#include <sys/conf.h>
#include <sys/kthread.h>
#include <sys/fstrans.h>
-#include <sys/simplelock.h>
#include <sys/vfs_syscalls.h> /* For do_sys_unlink(). */
#include <miscfs/specfs/specdev.h>
Index: src/sys/dev/fssvar.h
diff -u src/sys/dev/fssvar.h:1.27 src/sys/dev/fssvar.h:1.28
--- src/sys/dev/fssvar.h:1.27 Tue Nov 29 20:56:12 2011
+++ src/sys/dev/fssvar.h Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fssvar.h,v 1.27 2011/11/29 20:56:12 bouyer Exp $ */
+/* $NetBSD: fssvar.h,v 1.28 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -32,8 +32,6 @@
#ifndef _SYS_DEV_FSSVAR_H
#define _SYS_DEV_FSSVAR_H
-#include <sys/simplelock.h>
-
#define FSS_UNCONFIG_ON_CLOSE 0x01 /* Unconfigure on last close */
#define FSS_UNLINK_ON_CREATE 0x02 /* Unlink backing store on create */
Index: src/sys/dev/raidframe/raidframevar.h
diff -u src/sys/dev/raidframe/raidframevar.h:1.15 src/sys/dev/raidframe/raidframevar.h:1.16
--- src/sys/dev/raidframe/raidframevar.h:1.15 Sat Feb 19 07:11:09 2011
+++ src/sys/dev/raidframe/raidframevar.h Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.15 2011/02/19 07:11:09 enami Exp $ */
+/* $NetBSD: raidframevar.h,v 1.16 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -102,7 +102,6 @@
#include <sys/uio.h>
#include <sys/param.h>
#include <sys/proc.h>
-#include <sys/simplelock.h>
#include <sys/mallocvar.h>
#endif
Index: src/sys/dev/raidframe/rf_threadstuff.h
diff -u src/sys/dev/raidframe/rf_threadstuff.h:1.33 src/sys/dev/raidframe/rf_threadstuff.h:1.34
--- src/sys/dev/raidframe/rf_threadstuff.h:1.33 Wed May 11 18:13:12 2011
+++ src/sys/dev/raidframe/rf_threadstuff.h Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.h,v 1.33 2011/05/11 18:13:12 mrg Exp $ */
+/* $NetBSD: rf_threadstuff.h,v 1.34 2014/02/28 10:16:51 skrll Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,6 @@
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kthread.h>
-#include <sys/simplelock.h>
#include <sys/mutex.h>
#include <dev/raidframe/raidframevar.h>
Index: src/sys/dev/spi/spivar.h
diff -u src/sys/dev/spi/spivar.h:1.4 src/sys/dev/spi/spivar.h:1.5
--- src/sys/dev/spi/spivar.h:1.4 Wed Jun 8 23:05:48 2011
+++ src/sys/dev/spi/spivar.h Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: spivar.h,v 1.4 2011/06/08 23:05:48 rmind Exp $ */
+/* $NetBSD: spivar.h,v 1.5 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -45,7 +45,6 @@
#define _DEV_SPI_SPIVAR_H_
#include <sys/queue.h>
-#include <sys/simplelock.h>
/*
* Serial Peripheral Interface bus. This is a 4-wire bus common for
Index: src/sys/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.307 src/sys/kern/kern_synch.c:1.308
--- src/sys/kern/kern_synch.c:1.307 Sun Sep 15 13:03:59 2013
+++ src/sys/kern/kern_synch.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.307 2013/09/15 13:03:59 martin Exp $ */
+/* $NetBSD: kern_synch.c,v 1.308 2014/02/28 10:16:51 skrll Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.307 2013/09/15 13:03:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.308 2014/02/28 10:16:51 skrll Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -95,7 +95,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_synch.c
#include <sys/intr.h>
#include <sys/lwpctl.h>
#include <sys/atomic.h>
-#include <sys/simplelock.h>
#include <sys/syslog.h>
#include <uvm/uvm_extern.h>
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.286 src/sys/rump/librump/rumpkern/rump.c:1.287
--- src/sys/rump/librump/rumpkern/rump.c:1.286 Tue Feb 25 18:30:13 2014
+++ src/sys/rump/librump/rumpkern/rump.c Fri Feb 28 10:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.286 2014/02/25 18:30:13 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.287 2014/02/28 10:16:51 skrll Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.286 2014/02/25 18:30:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.287 2014/02/28 10:16:51 skrll Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.2
#include <sys/uidinfo.h>
#include <sys/vmem.h>
#include <sys/xcall.h>
-#include <sys/simplelock.h>
#include <sys/cprng.h>
#include <sys/ktrace.h>