From owner-svn-src-head@freebsd.org Tue Nov 26 17:25:50 2019 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 AEA951BCC56; Tue, 26 Nov 2019 17:25:50 +0000 (UTC) (envelope-from scottl@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 47MrQk46v7z43yq; Tue, 26 Nov 2019 17:25:50 +0000 (UTC) (envelope-from scottl@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 709F95E0; Tue, 26 Nov 2019 17:25:50 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAQHPoU6049075; Tue, 26 Nov 2019 17:25:50 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAQHPoR3049073; Tue, 26 Nov 2019 17:25:50 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201911261725.xAQHPoR3049073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Tue, 26 Nov 2019 17:25:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355114 - in head: share/man/man4 sys/dev/hpt27xx X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head: share/man/man4 sys/dev/hpt27xx X-SVN-Commit-Revision: 355114 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: Tue, 26 Nov 2019 17:25:50 -0000 Author: scottl Date: Tue Nov 26 17:25:49 2019 New Revision: 355114 URL: https://svnweb.freebsd.org/changeset/base/355114 Log: Revert r355021. In my haste to grep for Giant, I missed that it was in conditional ifdefs for this driver. We will consider removing those ifdefs in the future. Reported by: imp Modified: head/share/man/man4/hpt27xx.4 head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Modified: head/share/man/man4/hpt27xx.4 ============================================================================== --- head/share/man/man4/hpt27xx.4 Tue Nov 26 15:52:19 2019 (r355113) +++ head/share/man/man4/hpt27xx.4 Tue Nov 26 17:25:49 2019 (r355114) @@ -44,9 +44,6 @@ module at boot time, place the following line in .Bd -literal -offset indent hpt27xx_load="YES" .Ed -.Sh DEPRECATION NOTICE -This driver is scheduled for removal prior to the release of -.Fx 13.0 . .Sh DESCRIPTION The .Nm Modified: head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c ============================================================================== --- head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Tue Nov 26 15:52:19 2019 (r355113) +++ head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Tue Nov 26 17:25:49 2019 (r355114) @@ -76,9 +76,7 @@ static int hpt_attach(device_t dev) HPT_UINT size; PVBUS vbus; PVBUS_EXT vbus_ext; - - gone_in(13, "Giant locked CAM drivers"); - + KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); him = hpt_match(dev, 1);