Module Name: src
Committed By: christos
Date: Thu Aug 20 09:45:45 UTC 2015
Modified Files:
src/sys/kern: kern_cpu.c kern_drvctl.c kern_ksyms.c tty_ptm.c tty_pty.c
Log Message:
include ioconf.h instead of locally declaring the prototype of the attach
function
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_ksyms.c
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/tty_pty.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/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.69 src/sys/kern/kern_cpu.c:1.70
--- src/sys/kern/kern_cpu.c:1.69 Thu Aug 20 04:27:09 2015
+++ src/sys/kern/kern_cpu.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.69 2015/08/20 08:27:09 uebayasi Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.70 2015/08/20 09:45:45 christos Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.69 2015/08/20 08:27:09 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.70 2015/08/20 09:45:45 christos Exp $");
#include "opt_cpu_ucode.h"
#include "opt_compat_netbsd.h"
@@ -83,6 +83,8 @@ __KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v
#include <uvm/uvm_extern.h>
+#include "ioconf.h"
+
/*
* If the port has stated that cpu_data is the first thing in cpu_info,
* verify that the claim is true. This will prevent them from getting out
@@ -94,8 +96,6 @@ CTASSERT(offsetof(struct cpu_info, ci_da
CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
#endif
-void cpuctlattach(int);
-
static void cpu_xc_online(struct cpu_info *);
static void cpu_xc_offline(struct cpu_info *);
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.38 src/sys/kern/kern_drvctl.c:1.39
--- src/sys/kern/kern_drvctl.c:1.38 Thu Aug 20 04:27:09 2015
+++ src/sys/kern/kern_drvctl.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.38 2015/08/20 08:27:09 uebayasi Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.39 2015/08/20 09:45:45 christos Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.38 2015/08/20 08:27:09 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.39 2015/08/20 09:45:45 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: kern_drvctl.
#include <sys/kauth.h>
#include <sys/lwp.h>
+#include "ioconf.h"
+
struct drvctl_event {
TAILQ_ENTRY(drvctl_event) dce_link;
prop_dictionary_t dce_event;
@@ -80,8 +82,6 @@ const struct cdevsw drvctl_cdevsw = {
.d_flag = D_OTHER
};
-void drvctlattach(int);
-
static int drvctl_read(struct file *, off_t *, struct uio *,
kauth_cred_t, int);
static int drvctl_write(struct file *, off_t *, struct uio *,
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.76 src/sys/kern/kern_ksyms.c:1.77
--- src/sys/kern/kern_ksyms.c:1.76 Tue May 19 22:45:20 2015
+++ src/sys/kern/kern_ksyms.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.76 2015/05/20 02:45:20 matt Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.77 2015/08/20 09:45:45 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.76 2015/05/20 02:45:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.77 2015/08/20 09:45:45 christos Exp $");
#if defined(_KERNEL) && defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -95,6 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c
#endif
#include "ksyms.h"
+#include "ioconf.h"
#define KSYMS_MAX_ID 65536
#ifdef KDTRACE_HOOKS
@@ -110,7 +111,6 @@ static bool ksyms_loaded;
static kmutex_t ksyms_lock __cacheline_aligned;
static struct ksyms_symtab kernel_symtab;
-void ksymsattach(int);
static void ksyms_hdr_init(void *);
static void ksyms_sizes_calc(void);
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.35 src/sys/kern/tty_ptm.c:1.36
--- src/sys/kern/tty_ptm.c:1.35 Wed Oct 15 11:00:03 2014
+++ src/sys/kern/tty_ptm.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.35 2014/10/15 15:00:03 christos Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.36 2015/08/20 09:45:45 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.35 2014/10/15 15:00:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.36 2015/08/20 09:45:45 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ptm.h"
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v
#include <compat/sys/ttycom.h>
#endif /* COMPAT_60 */
+#include "ioconf.h"
+
#ifdef DEBUG_PTM
#define DPRINTF(a) printf a
#else
@@ -89,8 +91,6 @@ static int pty_alloc_master(struct lwp *
static int pty_alloc_slave(struct lwp *, int *, dev_t, struct mount *);
static int pty_vn_open(struct vnode *, struct lwp *);
-void ptmattach(int);
-
int
pty_getmp(struct lwp *l, struct mount **mpp)
{
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.141 src/sys/kern/tty_pty.c:1.142
--- src/sys/kern/tty_pty.c:1.141 Sat Oct 18 04:33:29 2014
+++ src/sys/kern/tty_pty.c Thu Aug 20 05:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.141 2014/10/18 08:33:29 snj Exp $ */
+/* $NetBSD: tty_pty.c,v 1.142 2015/08/20 09:45:45 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.141 2014/10/18 08:33:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142 2015/08/20 09:45:45 christos Exp $");
#include "opt_ptm.h"
@@ -62,6 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v
#include <sys/pty.h>
#include <sys/kauth.h>
+#include "ioconf.h"
+
#define DEFAULT_NPTYS 16 /* default number of initial ptys */
#define DEFAULT_MAXPTYS 992 /* default maximum number of ptys */
@@ -86,7 +88,6 @@ int npty = 0; /* for pstat -t */
#define PF_NOSTOP 0x40
#define PF_UCNTL 0x80 /* user control mode */
-void ptyattach(int);
void ptcwakeup(struct tty *, int);
void ptsstart(struct tty *);
int pty_maxptys(int, int);
