From owner-svn-src-head@FreeBSD.ORG  Sat Jan 28 01:38:49 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 029A81065672;
	Sat, 28 Jan 2012 01:38:49 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E64428FC0A;
	Sat, 28 Jan 2012 01:38:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0S1cmuZ069762;
	Sat, 28 Jan 2012 01:38:48 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0S1cmgS069760;
	Sat, 28 Jan 2012 01:38:48 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201201280138.q0S1cmgS069760@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 28 Jan 2012 01:38:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230636 - head/sys/dev/hwpmc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jan 2012 01:38:49 -0000

Author: emaste
Date: Sat Jan 28 01:38:48 2012
New Revision: 230636
URL: http://svn.freebsd.org/changeset/base/230636

Log:
  pmc_*_initialize may return NULL if the CPU is not supported, so check
  that md is not null before dereferencing it.
  
  PR:		kern/156540

Modified:
  head/sys/dev/hwpmc/hwpmc_x86.c

Modified: head/sys/dev/hwpmc/hwpmc_x86.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_x86.c	Sat Jan 28 00:17:17 2012	(r230635)
+++ head/sys/dev/hwpmc/hwpmc_x86.c	Sat Jan 28 01:38:48 2012	(r230636)
@@ -250,7 +250,7 @@ pmc_md_initialize()
 		return (NULL);
 
 	/* disallow sampling if we do not have an LAPIC */
-	if (!lapic_enable_pmc())
+	if (md != NULL && !lapic_enable_pmc())
 		for (i = 1; i < md->pmd_nclass; i++)
 			md->pmd_classdep[i].pcd_caps &= ~PMC_CAP_INTERRUPT;