d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove compat shims for FreeBSD versions older than 6 (really early 5).

Browse Source 
The only diffs in the disassembly were different line numbers passed to
lock functions.
This commit is contained in:
John Baldwin 2015-01-06 15:48:20 +00:00
parent 7fc5f32950
commit d17591488e
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ciss/ciss.c
View File

@ -4164,9 +4164,7 @@ ciss_notify_thread(void *arg)
struct ciss_notify *cn; struct ciss_notify *cn;
sc = (struct ciss_softc *)arg; sc = (struct ciss_softc *)arg;
#if __FreeBSD_version >= 500000
mtx_lock(&sc->ciss_mtx); mtx_lock(&sc->ciss_mtx);
#endif
for (;;) { for (;;) {
if (STAILQ_EMPTY(&sc->ciss_notify) != 0 && if (STAILQ_EMPTY(&sc->ciss_notify) != 0 &&
@ -4201,9 +4199,7 @@ ciss_notify_thread(void *arg)
sc->ciss_notify_thread = NULL; sc->ciss_notify_thread = NULL;
wakeup(&sc->ciss_notify_thread); wakeup(&sc->ciss_notify_thread);
#if __FreeBSD_version >= 500000
mtx_unlock(&sc->ciss_mtx); mtx_unlock(&sc->ciss_mtx);
#endif
kproc_exit(0); kproc_exit(0);
} }
@ -4214,15 +4210,9 @@ static void
ciss_spawn_notify_thread(struct ciss_softc *sc) ciss_spawn_notify_thread(struct ciss_softc *sc)
{ {
#if __FreeBSD_version > 500005
if (kproc_create((void(*)(void *))ciss_notify_thread, sc, if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
&sc->ciss_notify_thread, 0, 0, "ciss_notify%d", &sc->ciss_notify_thread, 0, 0, "ciss_notify%d",
device_get_unit(sc->ciss_dev))) 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"); panic("Could not create notify thread\n");
} }

8
sys/dev/ciss/cissvar.h
View File

@ -76,14 +76,6 @@ typedef STAILQ_HEAD(, ciss_request) cr_qhead_t;
*/ */
#define CISS_HEARTBEAT_RATE 10 #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. * Driver version. Only really significant to the ACU interface.
*/ */