diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c
index 2e228d83f7e..9a6e7394119 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.c
+++ b/sys/dev/hwpmc/hwpmc_uncore.c
@@ -974,26 +974,18 @@ ucp_start_pmc(int cpu, int ri)
 	/* Event specific configuration. */
 	switch (pm->pm_event) {
 	case PMC_EV_UCP_EVENT_0CH_04H_E:
-		wrmsr(MSR_GQ_SNOOP_MESF,0x2);
-		break;
-	case PMC_EV_UCP_EVENT_0CH_04H_F:
-		wrmsr(MSR_GQ_SNOOP_MESF,0x8);
-		break;
-	case PMC_EV_UCP_EVENT_0CH_04H_M:
-		wrmsr(MSR_GQ_SNOOP_MESF,0x1);
-		break;
-	case PMC_EV_UCP_EVENT_0CH_04H_S:
-		wrmsr(MSR_GQ_SNOOP_MESF,0x4);
-		break;
 	case PMC_EV_UCP_EVENT_0CH_08H_E:
 		wrmsr(MSR_GQ_SNOOP_MESF,0x2);
 		break;
+	case PMC_EV_UCP_EVENT_0CH_04H_F:
 	case PMC_EV_UCP_EVENT_0CH_08H_F:
 		wrmsr(MSR_GQ_SNOOP_MESF,0x8);
-		break;	
+		break;
+	case PMC_EV_UCP_EVENT_0CH_04H_M:
 	case PMC_EV_UCP_EVENT_0CH_08H_M:
 		wrmsr(MSR_GQ_SNOOP_MESF,0x1);
 		break;
+	case PMC_EV_UCP_EVENT_0CH_04H_S:
 	case PMC_EV_UCP_EVENT_0CH_08H_S:
 		wrmsr(MSR_GQ_SNOOP_MESF,0x4);
 		break;
diff --git a/sys/dev/hwpmc/hwpmc_uncore.h b/sys/dev/hwpmc/hwpmc_uncore.h
index a8a12c4833c..6c3b4cf9e3d 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.h
+++ b/sys/dev/hwpmc/hwpmc_uncore.h
@@ -87,7 +87,6 @@ struct pmc_md_ucp_op_pmcallocate {
 #define	UC_GLOBAL_CTRL				0x391
 #define	UC_GLOBAL_OVF_CTRL			0x393
 
-
 #define	UC_GLOBAL_STATUS_FLAG_CLRCHG		(1ULL << 63)
 #define	UC_GLOBAL_STATUS_FLAG_OVFPMI		(1ULL << 61)
 #define	UC_GLOBAL_CTRL_FLAG_FRZ			(1ULL << 63)