Date: Thu, 14 Jun 2012 06:26:58 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r237047 - stable/9/sbin/mca Message-ID: <201206140626.q5E6QwJs074766@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206140626.q5E6QwJs074766>