diff options
| -rw-r--r-- | sys/dev/ic/mfi.c | 9 | ||||
| -rw-r--r-- | sys/dev/ic/mfivar.h | 13 | ||||
| -rw-r--r-- | sys/dev/pci/mfi_pci.c | 4 |
3 files changed, 11 insertions, 15 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 2c0c2b4eed7..f8e7ca55fdc 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.83 2008/10/26 18:56:00 marco Exp $ */ +/* $OpenBSD: mfi.c,v 1.84 2008/10/27 03:11:58 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -26,6 +26,7 @@ #include <sys/malloc.h> #include <sys/proc.h> #include <sys/rwlock.h> +#include <sys/sensors.h> #include <machine/bus.h> @@ -33,14 +34,10 @@ #include <scsi/scsi_disk.h> #include <scsi/scsiconf.h> +#include <dev/biovar.h> #include <dev/ic/mfireg.h> #include <dev/ic/mfivar.h> -#if NBIO > 0 -#include <dev/biovar.h> -#include <sys/sensors.h> -#endif /* NBIO > 0 */ - #ifdef MFI_DEBUG uint32_t mfi_debug = 0 /* | MFI_D_CMD */ diff --git a/sys/dev/ic/mfivar.h b/sys/dev/ic/mfivar.h index bab5f3beb3a..b3f731dbef5 100644 --- a/sys/dev/ic/mfivar.h +++ b/sys/dev/ic/mfivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mfivar.h,v 1.32 2008/10/26 18:56:24 marco Exp $ */ +/* $OpenBSD: mfivar.h,v 1.33 2008/10/27 03:11:58 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -15,8 +15,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/sensors.h> - #define DEVNAME(_s) ((_s)->sc_dev.dv_xname) /* #define MFI_DEBUG */ @@ -119,9 +117,6 @@ struct mfi_softc { bus_space_handle_t sc_ioh; bus_dma_tag_t sc_dmat; - /* mgmt lock */ - struct rwlock sc_lock; - /* save some useful information for logical drives that is missing * in sc_ld_list */ @@ -158,10 +153,12 @@ struct mfi_softc { struct mfi_ccb_list sc_ccb_freeq; -#ifndef SMALL_KERNEL + /* mgmt lock */ + struct rwlock sc_lock; + + /* sensors */ struct ksensor *sc_sensors; struct ksensordev sc_sensordev; -#endif }; int mfi_attach(struct mfi_softc *sc, enum mfi_iop); diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index b187b3cdec6..7802b478db3 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi_pci.c,v 1.16 2008/02/11 03:52:50 dlg Exp $ */ +/* $OpenBSD: mfi_pci.c,v 1.17 2008/10/27 03:11:58 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -15,6 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "bio.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> |