Author: eadler
Date: Thu May 31 08:22:02 2012
New Revision: 236355
URL: http://svn.freebsd.org/changeset/base/236355
Log:
Fix a variety of compile errors with gcc48 and clang
PR: bin/165699
Submitted by: Arne Meyer <meyer.arn...@gmail.com>
Approved by: cperciva
MFC after: 1 week
Modified:
head/sbin/mca/Makefile
head/sbin/mca/mca.c
Modified: head/sbin/mca/Makefile
==============================================================================
--- head/sbin/mca/Makefile Thu May 31 07:44:27 2012 (r236354)
+++ head/sbin/mca/Makefile Thu May 31 08:22:02 2012 (r236355)
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= mca
-WARNS?= 4
MAN= mca.8
.include <bsd.prog.mk>
Modified: head/sbin/mca/mca.c
==============================================================================
--- head/sbin/mca/mca.c Thu May 31 07:44:27 2012 (r236354)
+++ head/sbin/mca/mca.c Thu May 31 08:22:02 2012 (r236355)
@@ -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");
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
