proper cdev_decl(ksyms), fix ksyms's broken functions

16 files changed, 23 insertions, 40 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 36c17de5846..bf0daaad82d 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.43 2002/06/24 19:00:33 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.44 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -116,7 +116,6 @@ cdev_decl(cy);
 cdev_decl(xfs_dev);
 #endif
 #include "ksyms.h"
-cdev_decl(ksyms);
 
 /* USB Devices */
 #include "usb.h"
diff --git a/sys/arch/amiga/include/conf.h b/sys/arch/amiga/include/conf.h
index a8657150ff1..3717b10c036 100644
--- a/sys/arch/amiga/include/conf.h
+++ b/sys/arch/amiga/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.16 2002/06/11 05:15:18 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.17 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.4 1996/11/30 01:13:07 is Exp $	*/
 
 /*
@@ -64,8 +64,6 @@ cdev_decl(view);
 bdev_decl(wd);
 cdev_decl(wd);
 
-cdev_decl(ksyms);
-
 cdev_decl(joy);
 
 /* open, close, ioctl, select, mmap -- XXX should be a map device */
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index e16687b646e..0aa22f31dad 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.29 2002/05/16 21:11:13 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.30 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $	*/
 
 /*-
@@ -121,7 +121,6 @@ cdev_decl(fd);
 #include "bpfilter.h"
 #include "tun.h"
 #include "ksyms.h"
-cdev_decl(ksyms);   
 #ifdef XFS
 #include <xfs/nxfs.h>
 cdev_decl(xfs_dev);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 05f5d25c997..e573d2d9ccf 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.20 2002/06/11 05:15:18 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.21 2002/07/10 22:08:47 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -97,7 +97,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #include "tun.h"
 
 #include "ksyms.h"
-cdev_decl(ksyms);
 
 #include "lpt.h"
 cdev_decl(lpt);
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index b97eade3c07..ee63bab8db2 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.97 2002/07/10 21:53:26 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.98 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -185,7 +185,6 @@ cdev_decl(bktr);
 #include "wdt.h"
 cdev_decl(wdt);
 #include "ksyms.h"
-cdev_decl(ksyms);   
 #include "usb.h"
 #include "uhid.h"
 #include "ugen.h"
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 254a1a4a2a4..1abe6ee0965 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.29 2002/05/16 21:11:15 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.30 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $	*/
 
 /*
@@ -103,7 +103,6 @@ cdev_decl(zs);
 #include "asc.h"
 cdev_decl(asc);
 #include "ksyms.h"
-cdev_decl(ksyms);
 #ifdef XFS
 #include <xfs/nxfs.h>
 cdev_decl(xfs_dev);
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index eb4e368b9ce..51cb832a693 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.15 2002/06/24 19:00:33 mickey Exp $ */
+/*	$OpenBSD: conf.c,v 1.16 2002/07/10 22:08:47 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -117,7 +117,6 @@ cdev_decl(xfs_dev);
 #endif
 
 #include "ksyms.h"
-cdev_decl(ksyms);
 #include "usb.h"
 #include "uhid.h"
 #include "ugen.h"
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 2b54af82448..fb7b331ab46 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.29 2002/05/16 21:11:15 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.30 2002/07/10 22:08:47 mickey Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -150,7 +150,6 @@ cdev_decl(lptwo);
 cdev_decl(xfs_dev);
 #endif
 #include "ksyms.h"
-cdev_decl(ksyms);
 
 #ifdef notyet
 cdev_decl(xd);
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 70628981874..7e49d201d2c 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2002/05/16 21:11:16 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 2002/07/10 22:08:47 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -60,7 +60,6 @@
 #cdev_decl(xfs_dev);
 #endif
 #include "ksyms.h"
-cdev_decl(ksyms);
 
 #include "sram.h"
 #include "nvram.h"
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 8f99df86d2b..057420238e5 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 2002/06/08 15:47:34 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.13 2002/07/10 22:08:47 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -113,7 +113,6 @@ cdev_decl(xfs_dev);
 #endif  
  
 #include "ksyms.h"
-cdev_decl(ksyms);
 
 #include "pf.h"
 
diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h
index d9b695013ec..eab974b0ba0 100644
--- a/sys/arch/sparc/include/conf.h
+++ b/sys/arch/sparc/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.14 2002/07/09 15:27:59 jason Exp $	*/
+/*	$OpenBSD: conf.h,v 1.15 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $	*/
 
 /*
@@ -126,5 +126,3 @@ cdev_decl(fga);
 	(dev_type_stop((*))) nullop, 0, seltrue, \
 	(dev_type_mmap((*))) enodev }
 cdev_decl(daadio);
-
-cdev_decl(ksyms);
diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h
index a0033d0ffc8..fb3c4c8b927 100644
--- a/sys/arch/sparc64/include/conf.h
+++ b/sys/arch/sparc64/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.11 2002/06/24 19:00:33 mickey Exp $	*/
+/*	$OpenBSD: conf.h,v 1.12 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $	*/
 
 /*-
@@ -43,11 +43,8 @@ cdev_decl(mm);
 
 cdev_decl(crypto);
 
-cdev_decl(ksyms);
-
 cdev_decl(openprom);
 
-
 /* open, close, ioctl */
 #define cdev_openprom_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
diff --git a/sys/arch/sun3/include/conf.h b/sys/arch/sun3/include/conf.h
index 2b02e46d4a1..53d343575fc 100644
--- a/sys/arch/sun3/include/conf.h
+++ b/sys/arch/sun3/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.10 2001/12/11 23:19:02 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.11 2002/07/10 22:08:47 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1996 Kenneth Stailey.  All rights reserved.
@@ -68,5 +68,3 @@ cdev_decl(bw2);
 cdev_decl(cg2);
 #include "cgfour.h"
 cdev_decl(cg4);
-
-cdev_decl(ksyms);
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index da4f53ae6c9..d7ca628cc09 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.36 2002/06/24 10:41:13 hugh Exp $ */
+/*	$OpenBSD: conf.c,v 1.37 2002/07/10 22:08:47 mickey Exp $ */
 /*	$NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $	*/
 
 /*-
@@ -109,7 +109,6 @@ bdev_decl(ry);
 #include "cd.h"
 
 #include "ksyms.h"
-cdev_decl(ksyms);
 
 struct bdevsw	bdevsw[] =
 {
diff --git a/sys/dev/ksyms.c b/sys/dev/ksyms.c
index cfec4e59d4f..f4d1f785506 100644
--- a/sys/dev/ksyms.c
+++ b/sys/dev/ksyms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ksyms.c,v 1.12 2002/03/14 01:26:52 millert Exp $	*/
+/*	$OpenBSD: ksyms.c,v 1.13 2002/07/10 22:08:47 mickey Exp $	*/
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
@@ -34,6 +34,7 @@
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
+#include <sys/conf.h>
 
 #ifdef _NLIST_DO_ELF
 #include <sys/exec_elf.h>
@@ -56,9 +57,6 @@ static size_t ksym_head_size;
 static size_t ksym_syms_size;
 
 void	ksymsattach(int);
-int	ksymsopen(dev_t, int, int);
-int	ksymsclose(dev_t, int, int);
-int	ksymsread(dev_t, struct uio *, int);
 
 /*
  * We assume __LDPGSZ is a multiple of PAGE_SIZE (it is)
@@ -157,9 +155,10 @@ ksymsattach(num)
 
 /*ARGSUSED*/
 int
-ksymsopen(dev, flag, mode)
+ksymsopen(dev, flag, mode, p)
 	dev_t dev;
 	int flag, mode;
+	struct proc *p;
 {
 
 	/* There are no non-zero minor devices */
@@ -179,9 +178,10 @@ ksymsopen(dev, flag, mode)
 
 /*ARGSUSED*/
 int
-ksymsclose(dev, flag, mode)
+ksymsclose(dev, flag, mode, p)
 	dev_t dev;
 	int flag, mode;
+	struct proc *p;
 {
 
 	return (0);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 95a7c5cbbae..b74676dec07 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.64 2002/07/10 21:53:26 mickey Exp $	*/
+/*	$OpenBSD: conf.h,v 1.65 2002/07/10 22:08:47 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $	*/
 
 /*-
@@ -578,6 +578,8 @@ cdev_decl(wsmux);
 #endif
 cdev_decl(svr4_net);
 
+cdev_decl(ksyms);
+
 cdev_decl(systrace);
 
 cdev_decl(bio);