Fix a variety of compile errors with gcc48 and clang

PR:		bin/165699
Submitted by:	Arne Meyer <meyer.arne83@gmail.com>
Approved by:	cperciva
MFC after:	1 week
This commit is contained in:
eadler 2012-05-31 08:22:02 +00:00
parent 4ade65012f
commit b2cd8b6afd
2 changed files with 10 additions and 7 deletions

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PROG= mca
WARNS?= 4
MAN= mca.8
.include <bsd.prog.mk>

View File

@ -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");
}