From 95104040a3cd64c1089b219d99e58bc17dba2522 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Wed, 23 May 2018 19:55:47 +0000 Subject: [PATCH] pmc: bump PMC major version to reflect ABI breakage and make warning not require verbose --- sys/sys/pmc.h | 2 +- usr.sbin/pmcstat/pmcstat_log.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index a5306c7f75b4..64d10ab6f512 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -61,7 +61,7 @@ * * The patch version is incremented for every bug fix. */ -#define PMC_VERSION_MAJOR 0x03 +#define PMC_VERSION_MAJOR 0x04 #define PMC_VERSION_MINOR 0x01 #define PMC_VERSION_PATCH 0x0000 diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c index b0600fe6c3b1..cc3e9c49203f 100644 --- a/usr.sbin/pmcstat/pmcstat_log.c +++ b/usr.sbin/pmcstat/pmcstat_log.c @@ -406,7 +406,7 @@ pmcstat_print_log(void) ev.pl_u.pl_i.pl_version, pmc_name_of_cputype(ev.pl_u.pl_i.pl_arch)); if ((ev.pl_u.pl_i.pl_version & 0xFF000000) != - PMC_VERSION_MAJOR << 24 && args.pa_verbosity > 0) + PMC_VERSION_MAJOR << 24) warnx( "WARNING: Log version 0x%x != expected version 0x%x.", ev.pl_u.pl_i.pl_version, PMC_VERSION);