OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
CVS: cvs.openbsd.org: src

From: David Gwynne (dlgcvs.openbsd.org)
Date: Mon May 17 2010 - 23:41:15 CDT


CVSROOT: /cvs
Module name: src
Changes by: dlgcvs.openbsd.org 2010/05/17 22:41:15

Modified files:
        sbin/bioctl : bioctl.c
        sbin/disklabel : disklabel.c editor.c
        sbin/fdisk : disk.c
        sbin/fsck_ext2fs: setup.c
        sbin/fsck_ffs : setup.c
        sbin/fsirand : fsirand.c
        sbin/growfs : growfs.c
        sbin/newfs : newfs.c
        sbin/newfs_ext2fs: newfs_ext2fs.c
        sbin/newfs_msdos: newfs_msdos.c
        sys/arch/sgi/stand/sgivol: sgivol.c
        sys/compat/linux: linux_blkio.c linux_hdio.c
        sys/dev : ccd.c softraid.c softraid_crypto.c vnd.c
        sys/dev/ata : wd.c
        sys/dev/isa : fd.c
        sys/miscfs/specfs: spec_vnops.c
        sys/scsi : cd.c sd.c
        sys/sys : ioctl.h
        sys/ufs/ext2fs : ext2fs_vfsops.c
        sys/ufs/ffs : ffs_vfsops.c
        sys/uvm : uvm_vnode.c

Log message:
dont let sys/ioctl.h imply that you get the ioctls in dkio.h. this
gets rid of #include <sys/dkio.h> in sys/ioctl.h and adds #include
<sys/dkio.h> to the places that actually want and use the disk
ioctls.

this became an issue when krw's X build failed when he was testing
a change to dkio.h.
tested by krw
help from and ok miod