From 0444d8258d3c6c2219b8aadd39daf2fe9473512c Mon Sep 17 00:00:00 2001
From: rrs <rrs@FreeBSD.org>
Date: Tue, 24 Mar 2015 20:00:11 +0000
Subject: MFC of r277177 and r279894 with the fixes for the PMC for Haswell.

Sponsored by:	Netflix Inc.
---
 sys/dev/hwpmc/hwpmc_x86.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sys/dev/hwpmc/hwpmc_x86.c')

diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
index f4c6c94..f571e41 100644
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -40,7 +40,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/intr_machdep.h>
+#if (__FreeBSD_version >= 1100000)
+#include <x86/apicvar.h>
+#else
 #include <machine/apicvar.h>
+#endif
 #include <machine/pmc_mdep.h>
 #include <machine/md_var.h>
 
-- 
cgit v1.1