xen/perfc: Trim includes

This is mostly for the removal of xen/lib.h and xen/smp.h from perfc.h.  All
that is needed is xen/macros.h.

Trim and sort the includes for perfc.c too.  There's no need for smp.h,
keyhandler.h or mm.h, but cpumask.h is needed.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 8c967ab900f989bb60997fba9728db87daba2d3e..b748c8af855b96c4860e882b1d315b688bfabc46 100644 (file)
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -1,13 +1,12 @@
 
+#include <xen/cpumask.h>
 #include <xen/errno.h>
+#include <xen/guest_access.h>
 #include <xen/lib.h>
-#include <xen/smp.h>
-#include <xen/time.h>
 #include <xen/perfc.h>
-#include <xen/keyhandler.h> 
 #include <xen/spinlock.h>
-#include <xen/mm.h>
-#include <xen/guest_access.h>
+#include <xen/time.h>
+
 #include <public/sysctl.h>
 
 #define PERFCOUNTER( var, name )              { name, TYPE_SINGLE, 0 },

diff --git a/xen/include/xen/perfc.h b/xen/include/xen/perfc.h
index f9009dc388de6951f89c76840d850fcfd1697e5f..324b47665573e8162affb00b0d7a9a8b1d8eb0cb 100644 (file)
--- a/xen/include/xen/perfc.h
+++ b/xen/include/xen/perfc.h
@@ -3,8 +3,7 @@
 
 #ifdef CONFIG_PERF_COUNTERS
 
-#include <xen/lib.h>
-#include <xen/smp.h>
+#include <xen/macros.h>
 #include <xen/percpu.h>
 
 /*