summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2015-01-06 15:48:20 +0000
committerjhb <jhb@FreeBSD.org>2015-01-06 15:48:20 +0000
commitc8a5ac8577f6bd54d1b662d7c51cd3edc569fd14 (patch)
tree1cd34f4aa18c6debf354551093b8b19e24c89994
parent0c58376e125baa7c428c39068f2e0cd2f844515c (diff)
downloadFreeBSD-src-c8a5ac8577f6bd54d1b662d7c51cd3edc569fd14.zip
FreeBSD-src-c8a5ac8577f6bd54d1b662d7c51cd3edc569fd14.tar.gz
Remove compat shims for FreeBSD versions older than 6 (really early 5).
The only diffs in the disassembly were different line numbers passed to lock functions.
-rw-r--r--sys/dev/ciss/ciss.c10
-rw-r--r--sys/dev/ciss/cissvar.h8
2 files changed, 0 insertions, 18 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 918385a..6373287 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -4164,9 +4164,7 @@ ciss_notify_thread(void *arg)
struct ciss_notify *cn;
sc = (struct ciss_softc *)arg;
-#if __FreeBSD_version >= 500000
mtx_lock(&sc->ciss_mtx);
-#endif
for (;;) {
if (STAILQ_EMPTY(&sc->ciss_notify) != 0 &&
@@ -4201,9 +4199,7 @@ ciss_notify_thread(void *arg)
sc->ciss_notify_thread = NULL;
wakeup(&sc->ciss_notify_thread);
-#if __FreeBSD_version >= 500000
mtx_unlock(&sc->ciss_mtx);
-#endif
kproc_exit(0);
}
@@ -4214,15 +4210,9 @@ static void
ciss_spawn_notify_thread(struct ciss_softc *sc)
{
-#if __FreeBSD_version > 500005
if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
&sc->ciss_notify_thread, 0, 0, "ciss_notify%d",
device_get_unit(sc->ciss_dev)))
-#else
- if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
- &sc->ciss_notify_thread, "ciss_notify%d",
- device_get_unit(sc->ciss_dev)))
-#endif
panic("Could not create notify thread\n");
}
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index b3719cfa..6bc9cf4 100644
--- a/sys/dev/ciss/cissvar.h
+++ b/sys/dev/ciss/cissvar.h
@@ -77,14 +77,6 @@ typedef STAILQ_HEAD(, ciss_request) cr_qhead_t;
#define CISS_HEARTBEAT_RATE 10
/************************************************************************
- * Compatibility with older versions of FreeBSD
- */
-#if __FreeBSD_version < 440001
-#warning testing old-FreeBSD compat
-typedef struct proc d_thread_t;
-#endif
-
-/************************************************************************
* Driver version. Only really significant to the ACU interface.
*/
#define CISS_DRIVER_VERSION 20011201
OpenPOWER on IntegriCloud