From owner-svn-src-all@FreeBSD.ORG  Sat Jan  7 14:35:37 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF7CF106566C;
	Sat,  7 Jan 2012 14:35:37 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D99CA8FC12;
	Sat,  7 Jan 2012 14:35:37 +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 q07EZb3A043617;
	Sat, 7 Jan 2012 14:35:37 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q07EZbQL043615;
	Sat, 7 Jan 2012 14:35:37 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201071435.q07EZbQL043615@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 7 Jan 2012 14:35:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229776 - stable/9/sys/dev/hwpmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2012 14:35:38 -0000

Author: dim
Date: Sat Jan  7 14:35:37 2012
New Revision: 229776
URL: http://svn.freebsd.org/changeset/base/229776

Log:
  MFC r229076:
  
  In sys/dev/hwpmc/hwpmc_amd.c, fix a clang warning about invalid enum
  conversions.
  
  Reviewed by:	jkoshy

Modified:
  stable/9/sys/dev/hwpmc/hwpmc_amd.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_amd.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_amd.c	Sat Jan  7 14:04:00 2012	(r229775)
+++ stable/9/sys/dev/hwpmc/hwpmc_amd.c	Sat Jan  7 14:35:37 2012	(r229776)
@@ -889,7 +889,6 @@ pmc_amd_initialize(void)
 	 * field returned by CPUID for instruction family >= 6.
 	 */
 
-	class = cputype = -1;
 	name = NULL;
 	switch (cpu_id & 0xF00) {
 #if	defined(__i386__)
@@ -906,9 +905,8 @@ pmc_amd_initialize(void)
 		class = PMC_CLASS_K8;
 		name = "K8";
 		break;
-	}
 
-	if ((int) cputype == -1) {
+	default:
 		(void) printf("pmc: Unknown AMD CPU.\n");
 		return NULL;
 	}