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.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Julien Grall <jul...@xen.org>
CC: Volodymyr Babchuk <volodymyr_babc...@epam.com>
CC: Bertrand Marquis <bertrand.marq...@arm.com>
CC: Michal Orzel <michal.or...@amd.com>
CC: Oleksii Kurochko <oleksii.kuroc...@gmail.com>
CC: Shawn Anastasio <sanasta...@raptorengineering.com>
---
xen/common/perfc.c | 9 ++++-----
xen/include/xen/perfc.h | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 8c967ab900f9..b748c8af855b 100644
--- 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 f9009dc388de..324b47665573 100644
--- 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>
/*
--
2.39.5
