From 8e5edee96cee7d0fd2e05d2e8cd14312de6c920d Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 21 Jul 2010 15:40:04 +0000 Subject: [PATCH] Fix more cdev initializations which were using enodev for poll; ok kettenis --- sys/arch/amd64/include/conf.h | 4 ++-- sys/arch/arm/include/conf.h | 4 ++-- sys/arch/i386/include/conf.h | 4 ++-- sys/arch/landisk/include/conf.h | 4 ++-- sys/arch/loongson/include/conf.h | 4 ++-- sys/arch/macppc/include/conf.h | 6 +++--- sys/arch/sparc/include/conf.h | 6 +++--- sys/arch/sparc64/include/conf.h | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/arch/amd64/include/conf.h b/sys/arch/amd64/include/conf.h index ced984a5b7f..739e4f06ea1 100644 --- a/sys/arch/amd64/include/conf.h +++ b/sys/arch/amd64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.4 2007/09/12 18:18:27 deraadt Exp $ */ +/* $OpenBSD: conf.h,v 1.5 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -47,7 +47,7 @@ cdev_decl(bios); #define cdev_acpi_init(c,n) {\ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(acpi); diff --git a/sys/arch/arm/include/conf.h b/sys/arch/arm/include/conf.h index 484626c3463..0e578e9fd4b 100644 --- a/sys/arch/arm/include/conf.h +++ b/sys/arch/arm/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.6 2008/11/29 09:47:35 matthieu Exp $ */ +/* $OpenBSD: conf.h,v 1.7 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $ */ /* @@ -83,7 +83,7 @@ cdev_decl(fd); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(physcon); diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h index 2c6e683ec90..4de0d70ac7e 100644 --- a/sys/arch/i386/include/conf.h +++ b/sys/arch/i386/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.13 2007/11/25 15:42:15 tedu Exp $ */ +/* $OpenBSD: conf.h,v 1.14 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -52,7 +52,7 @@ cdev_decl(pc); #define cdev_acpiapm_init(c,n) {\ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(spkr); diff --git a/sys/arch/landisk/include/conf.h b/sys/arch/landisk/include/conf.h index e34fc42ca93..ce0cf6bd430 100644 --- a/sys/arch/landisk/include/conf.h +++ b/sys/arch/landisk/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 2006/11/03 20:21:23 mickey Exp $ */ +/* $OpenBSD: conf.h,v 1.4 2010/07/21 15:40:04 deraadt Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -63,7 +63,7 @@ cdev_decl(fd); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(com); diff --git a/sys/arch/loongson/include/conf.h b/sys/arch/loongson/include/conf.h index e1cb29d0fc1..144d04d1253 100644 --- a/sys/arch/loongson/include/conf.h +++ b/sys/arch/loongson/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.1 2010/02/28 08:30:27 otto Exp $ */ +/* $OpenBSD: conf.h,v 1.2 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -36,7 +36,7 @@ #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(apm); diff --git a/sys/arch/macppc/include/conf.h b/sys/arch/macppc/include/conf.h index 37acf78e894..ed478344e40 100644 --- a/sys/arch/macppc/include/conf.h +++ b/sys/arch/macppc/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.12 2007/11/12 19:23:26 kettenis Exp $ */ +/* $OpenBSD: conf.h,v 1.13 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */ /* @@ -40,7 +40,7 @@ cdev_decl(mm); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(apm); @@ -50,7 +50,7 @@ cdev_decl(zs); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) nullop, 0, selfalse, \ (dev_type_mmap((*))) enodev } cdev_decl(openprom); diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h index d4b8daa0b2b..574c93e42e6 100644 --- a/sys/arch/sparc/include/conf.h +++ b/sys/arch/sparc/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.21 2005/12/31 21:22:34 miod Exp $ */ +/* $OpenBSD: conf.h,v 1.22 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $ */ /* @@ -38,7 +38,7 @@ cdev_decl(mm); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) nullop, 0, selfalse, \ (dev_type_mmap((*))) enodev } cdev_decl(openprom); @@ -112,6 +112,6 @@ cdev_decl(daadio); #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) enodev, 0, selfalse, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } cdev_decl(apm); diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h index 77d550a58cd..331d2fdb0c1 100644 --- a/sys/arch/sparc64/include/conf.h +++ b/sys/arch/sparc64/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.20 2009/05/10 12:34:04 kettenis Exp $ */ +/* $OpenBSD: conf.h,v 1.21 2010/07/21 15:40:04 deraadt Exp $ */ /* $NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $ */ /*- @@ -40,7 +40,7 @@ cdev_decl(openprom); #define cdev_openprom_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) nullop, 0, selfalse, \ (dev_type_mmap((*))) enodev } cdev_decl(uperf); @@ -49,7 +49,7 @@ cdev_decl(uperf); #define cdev_uperf_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ - (dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \ + (dev_type_stop((*))) nullop, 0, selfalse, \ (dev_type_mmap((*))) enodev } #define cdev_gen_init(c,n) { \ -- 2.20.1