From owner-svn-src-all@FreeBSD.ORG Tue Jan 6 15:48:22 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2587BBC4; Tue, 6 Jan 2015 15:48:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC93B692; Tue, 6 Jan 2015 15:48:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t06FmLZL077251; Tue, 6 Jan 2015 15:48:21 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t06FmLoC077248; Tue, 6 Jan 2015 15:48:21 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201501061548.t06FmLoC077248@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 6 Jan 2015 15:48:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276754 - head/sys/dev/ciss X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jan 2015 15:48:22 -0000 Author: jhb Date: Tue Jan 6 15:48:20 2015 New Revision: 276754 URL: https://svnweb.freebsd.org/changeset/base/276754 Log: 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. Modified: head/sys/dev/ciss/ciss.c head/sys/dev/ciss/cissvar.h Modified: head/sys/dev/ciss/ciss.c ============================================================================== --- head/sys/dev/ciss/ciss.c Tue Jan 6 15:41:23 2015 (r276753) +++ head/sys/dev/ciss/ciss.c Tue Jan 6 15:48:20 2015 (r276754) @@ -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"); } Modified: head/sys/dev/ciss/cissvar.h ============================================================================== --- head/sys/dev/ciss/cissvar.h Tue Jan 6 15:41:23 2015 (r276753) +++ head/sys/dev/ciss/cissvar.h Tue Jan 6 15:48:20 2015 (r276754) @@ -77,14 +77,6 @@ typedef STAILQ_HEAD(, ciss_request) cr_q #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