From owner-svn-src-stable@FreeBSD.ORG  Thu Jun 14 06:26:58 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6F4B106564A;
	Thu, 14 Jun 2012 06:26:58 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id BFFE28FC0A;
	Thu, 14 Jun 2012 06:26:58 +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 q5E6QwEd074769;
	Thu, 14 Jun 2012 06:26:58 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5E6QwJs074766;
	Thu, 14 Jun 2012 06:26:58 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201206140626.q5E6QwJs074766@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 14 Jun 2012 06:26:58 +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: r237047 - stable/9/sbin/mca
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2012 06:26:59 -0000

Author: eadler
Date: Thu Jun 14 06:26:58 2012
New Revision: 237047
URL: http://svn.freebsd.org/changeset/base/237047

Log:
  MFC r236355:
  	Fix a variety of compile errors with gcc48 and clang
  
  PR:		bin/165699
  Approved by:	cperciva (implicit)

Modified:
  stable/9/sbin/mca/Makefile
  stable/9/sbin/mca/mca.c
Directory Properties:
  stable/9/sbin/mca/   (props changed)

Modified: stable/9/sbin/mca/Makefile
==============================================================================
--- stable/9/sbin/mca/Makefile	Thu Jun 14 04:24:13 2012	(r237046)
+++ stable/9/sbin/mca/Makefile	Thu Jun 14 06:26:58 2012	(r237047)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 PROG=	mca
-WARNS?=	4
 MAN=	mca.8
 
 .include <bsd.prog.mk>

Modified: stable/9/sbin/mca/mca.c
==============================================================================
--- stable/9/sbin/mca/mca.c	Thu Jun 14 04:24:13 2012	(r237046)
+++ stable/9/sbin/mca/mca.c	Thu Jun 14 06:26:58 2012	(r237047)
@@ -55,10 +55,10 @@ __FBSDID("$FreeBSD$");
 
 #define	HW_MCA_MAX_CPUID	255
 
-static char hw_mca_count[] = "hw.mca.count";
-static char hw_mca_first[] = "hw.mca.first";
-static char hw_mca_last[] = "hw.mca.last";
-static char hw_mca_recid[] = "hw.mca.%lu.%u";
+static const char hw_mca_count[] = "hw.mca.count";
+static const char hw_mca_first[] = "hw.mca.first";
+static const char hw_mca_last[] = "hw.mca.last";
+static const char hw_mca_recid[] = "hw.mca.%d.%u";
 
 static char default_dumpfile[] = "/var/log/mca.log";
 
@@ -162,7 +162,9 @@ show_cpu(struct mca_cpu_record *cpu)
 	char var[16];
 	struct mca_cpu_mod *mod;
 	struct mca_cpu_cpuid *cpuid;
+#ifdef notyet
 	struct mca_cpu_psi *psi;
+#endif
 	int i, n;
 
 	printf("    <cpu>\n");
@@ -200,8 +202,10 @@ show_cpu(struct mca_cpu_record *cpu)
 		show_value(6, var, "0x%016llx", (long long)cpuid->cpuid[i]);
 	}
 
-	psi = (struct mca_cpu_psi*)(cpuid + 1);
-	/* TODO: Dump PSI */
+#ifdef notyet
+	 psi = (struct mca_cpu_psi*)(cpuid + 1);
+#endif
+	 /* TODO: Dump PSI */
 
 	printf("    </cpu>\n");
 }