From owner-svn-src-head@freebsd.org Thu Feb 27 15:25:23 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1E559244F74; Thu, 27 Feb 2020 15:25:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48SxLp43ssz4KKq; Thu, 27 Feb 2020 15:25:22 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A3E41AD29; Thu, 27 Feb 2020 15:25:22 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01RFPMVO086661; Thu, 27 Feb 2020 15:25:22 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01RFPLMe086658; Thu, 27 Feb 2020 15:25:21 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202002271525.01RFPLMe086658@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 27 Feb 2020 15:25:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358389 - in head/sys/dev/sfxge: . common X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/dev/sfxge: . common X-SVN-Commit-Revision: 358389 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2020 15:25:23 -0000 Author: imp Date: Thu Feb 27 15:25:21 2020 New Revision: 358389 URL: https://svnweb.freebsd.org/changeset/base/358389 Log: Remove support for FreeBSD 7 and 8 Also, unifdef -DSFXGE_HAVE_DESCRIBE_INTR since it's now always defined. Modified: head/sys/dev/sfxge/common/efsys.h head/sys/dev/sfxge/sfxge.h head/sys/dev/sfxge/sfxge_intr.c Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Thu Feb 27 15:22:18 2020 (r358388) +++ head/sys/dev/sfxge/common/efsys.h Thu Feb 27 15:25:21 2020 (r358389) @@ -72,11 +72,6 @@ extern "C" { #endif #include "efx_types.h" -/* Common code requires this */ -#if __FreeBSD_version < 800068 -#define memmove(d, s, l) bcopy(s, d, l) -#endif - #ifndef B_FALSE #define B_FALSE FALSE #endif @@ -88,7 +83,7 @@ extern "C" { #define ISP2(x) (((x) & ((x) - 1)) == 0) #endif -#if defined(__x86_64__) && __FreeBSD_version >= 1000000 +#if defined(__x86_64__) #define SFXGE_USE_BUS_SPACE_8 1 Modified: head/sys/dev/sfxge/sfxge.h ============================================================================== --- head/sys/dev/sfxge/sfxge.h Thu Feb 27 15:22:18 2020 (r358388) +++ head/sys/dev/sfxge/sfxge.h Thu Feb 27 15:25:21 2020 (r358389) @@ -93,11 +93,6 @@ #define IFM_40G_CR4 IFM_UNKNOWN #endif -#if (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || \ - __FreeBSD_version >= 900003 -#define SFXGE_HAVE_DESCRIBE_INTR -#endif - #ifdef IFM_ETH_RXPAUSE #define SFXGE_HAVE_PAUSE_MEDIAOPTS #endif Modified: head/sys/dev/sfxge/sfxge_intr.c ============================================================================== --- head/sys/dev/sfxge/sfxge_intr.c Thu Feb 27 15:22:18 2020 (r358388) +++ head/sys/dev/sfxge/sfxge_intr.c Thu Feb 27 15:25:21 2020 (r358389) @@ -195,11 +195,9 @@ sfxge_intr_bus_enable(struct sfxge_softc *sc) sc->evq[index], &table[index].eih_tag)) != 0) { goto fail; } -#ifdef SFXGE_HAVE_DESCRIBE_INTR if (intr->n_alloc > 1) bus_describe_intr(sc->dev, table[index].eih_res, table[index].eih_tag, "%d", index); -#endif #ifdef RSS bus_bind_intr(sc->dev, table[index].eih_res, rss_getcpu(index));