From owner-svn-src-stable-10@FreeBSD.ORG  Mon Mar 30 16:28:06 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1C62C831;
 Mon, 30 Mar 2015 16:28:06 +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 077EAB8C;
 Mon, 30 Mar 2015 16:28:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2UGS5eP082115;
 Mon, 30 Mar 2015 16:28:05 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2UGS5C3082114;
 Mon, 30 Mar 2015 16:28:05 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201503301628.t2UGS5C3082114@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 30 Mar 2015 16:28:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r280856 - stable/10/sys/amd64/conf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2015 16:28:06 -0000

Author: jhb
Date: Mon Mar 30 16:28:04 2015
New Revision: 280856
URL: https://svnweb.freebsd.org/changeset/base/280856

Log:
  Revert accidental(?) change in r280455 and do not compile hwpmc statically
  into GENERIC by default.  This change is not present in HEAD and was not
  made in the two commits to HEAD that r280455 merged.

Modified:
  stable/10/sys/amd64/conf/GENERIC

Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC	Mon Mar 30 15:29:06 2015	(r280855)
+++ stable/10/sys/amd64/conf/GENERIC	Mon Mar 30 16:28:04 2015	(r280856)
@@ -84,7 +84,6 @@ options 	SMP			# Symmetric MultiProcesso
 device		cpufreq
 
 # Bus support.
-device		hwpmc
 device		acpi
 options 	ACPI_DMAR
 device		pci