From owner-svn-src-all@freebsd.org Fri Apr 7 05:19:50 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8290D32CC7; Fri, 7 Apr 2017 05:19:50 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 75977662; Fri, 7 Apr 2017 05:19:50 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg0-x241.google.com with SMTP id g2so12880974pge.2; Thu, 06 Apr 2017 22:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=GH7466dDL7O3sd17xSgCHJrnVmQq/mWd5x0x99rHFwA=; b=ravm3CAMAYeZs6K+HsORo2Nq2sHC/uobwmuivqajU9pm02Tz/PfuL5L5BMBeRSnJbr A4H0foWXXrj2AF3ivnFxG5ebNBvisMgz/dQdYBKyr0TkDmcTc2spSYcfaORjSOS/rvjO 4Mkk/9tqdDXUUyuOSaM/LiyLXPABfSg+LNtHBBwc5Fwtl6mJk1JSAefs/OWj6JGH9ha2 PQnx9fs8xMFl71hM5pQajyLnrHVeyOBaUXxXd3iW9RM1lMlWuPTwoGSZf5tRCwEWnYm+ DJKQ99YLU2Yf8YZ59nbMCQvGBSnX1MDgbWun7nXQvVzCqYXbf8gyahtYOdIirWRR9OGR f0oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=GH7466dDL7O3sd17xSgCHJrnVmQq/mWd5x0x99rHFwA=; b=BTKafa2q+oPvAmlz/yQb4/ZgRmKl3bex4xnGwMgv38ESzKYZfgLNCixRrfoiZ3Vg2g hAhgHa45n/hWhdc5qziQ3IdREX4OCgON/WS5sjY4ZWC358HsamXGHnH4efpN6TheNOjK 6W64Px5MpERqxe3YAorgA4Tt1E151nZIVreHl9yjp5Jg9U1AHbzCTR7fiHjOve30VBRw XyvbK422n65c1sK3Cgk55vmDrC7NJJNmeYNErOdNxuHiMbYf54rzhfkuEN+rNbPizBma JIIsjz0beEd9ZU3HjfBOuStsXy1SJEw92Zo6oysSgFSFFUkSeNVe/o+w4Cvl+TgeM/j0 tDBQ== X-Gm-Message-State: AFeK/H352y8BBVF/Vkzy44jnCJw/joAjv6Dz1ZIcgn19+g9lNCnbAMGCcwVhcF36dYAZBw== X-Received: by 10.84.245.2 with SMTP id i2mr47626108pll.131.1491542389903; Thu, 06 Apr 2017 22:19:49 -0700 (PDT) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id h71sm6673550pfj.65.2017.04.06.22.19.48 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Apr 2017 22:19:49 -0700 (PDT) Subject: Re: svn commit: r316591 - head/sys/dev/tpm Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201704062221.v36MLnr7092648@repo.freebsd.org> Date: Thu, 6 Apr 2017 22:19:48 -0700 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201704062221.v36MLnr7092648@repo.freebsd.org> To: "David E. O'Brien" X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 07 Apr 2017 05:19:50 -0000 --Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Apr 6, 2017, at 15:21, David E. O'Brien wrote: >=20 > Author: obrien > Date: Thu Apr 6 22:21:49 2017 > New Revision: 316591 > URL: https://svnweb.freebsd.org/changeset/base/316591 >=20 > Log: > Remove dead code. > The #ifdef __FreeBSD__ section within the OpenBSD tpm_attach() = implementation > can never be active. >=20 > Modified: > head/sys/dev/tpm/tpm.c >=20 > Modified: head/sys/dev/tpm/tpm.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/tpm/tpm.c Thu Apr 6 20:12:39 2017 = (r316590) > +++ head/sys/dev/tpm/tpm.c Thu Apr 6 22:21:49 2017 = (r316591) > @@ -422,12 +422,8 @@ tpm_attach(device_t parent, device_t sel > return; > } >=20 > -#ifdef __FreeBSD__ > - sc->sc_suspend =3D 0; > -#else > sc->sc_suspend =3D PWR_RESUME; > sc->sc_powerhook =3D powerhook_establish(tpm_powerhook, sc); > -#endif > } > #endif Hi David, I think you meant to delete the other piece of code (__FreeBSD__ = is always defined). Also, why delete lines that might make it harder to backport = changes from OpenBSD? Thanks, -Ngie --Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJY5yF0AAoJEPWDqSZpMIYV+pQP/RPJj24pi05ZZ6ENnDcpgpqc fEmTpG7cMFG80lPWyDE1WlzbEXkFyT2Ag3/q+1tlJMwMcgWospo3msrcPE/8KxBJ FT303Q4MFpaUecrY6ukbxvoRXJYjwh1USV9h5NixJisqlrKjrnpSt8ijv8w/ObkK RF8kKB2W/ROiNNaA8NR1OqyHmb1X/qfSKD1prkNq/pn3Y7IGjt8GRCk4e94Mfj1y PWOzdkeaNrS3L9+gt4T8Z8e10Oeigeegy8jrxGmMRN+8jNoZlEky6eVbvqG3a5bL Bocf92qnWMCdoRSaAGpafo5NkOWUitab2gONu26Ep2wvsxgKwycu+GJbsWiGpSLL RcQhzr59GTSCnOErHNNV8p7JrGIoqtDvujvjq1Ga+vFhDVI0OQtMnobVDizluUQf Vi9n1lCxNeUKIleRMY8T6ecvbU6zGcPgx/GEVvWLxklmNufoJXiHkAgrsUSCc3Zk H+EkejgUdeaZHm9TDk4kldmyX0JQcW4xB3AFFdpyMFOKTZqbHh/o2cvCB0uef8iV fO4IktwtFMOqGkIyvHxm4KiXuO5Jj1SRjP47zdo/VCPZC4BZAuvs2SfVN6wnn/hv gG/d1X7oJlaLaWba+8kmAc1DbCtCcp16inBsCoDHTQ5rsHRw/KB2dWiEx0LVq+5D A3LVJ0paMBCKolw6CqDZ =bGm3 -----END PGP SIGNATURE----- --Apple-Mail=_A80FA18F-487C-487F-808D-46F1C2EF6E78--