[PATCH 1/6] x86: Sort headers

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

In intel.c, drop asm/mwait.h and asm/uaccess.h, neither of which are used.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/arch/x86/acpi/cpu_idle.c  |  3 ++-
 xen/arch/x86/apic.c           | 25 ++++++++++++-------------
 xen/arch/x86/cpu/intel.c      | 14 ++++++--------
 xen/arch/x86/cpu/mwait-idle.c |  6 ++++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 19f710f0dd9d..86f32fd9a6f0 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -45,7 +45,6 @@
 #include <xen/softirq.h>
 #include <xen/trace.h>
 
-#include <acpi/cpufreq/cpufreq.h>
 #include <asm/apic.h>
 #include <asm/cpuidle.h>
 #include <asm/hpet.h>
@@ -55,6 +54,8 @@
 #include <asm/processor.h>
 #include <asm/spec_ctrl.h>
 
+#include <acpi/cpufreq/cpufreq.h>
+
 #include <public/platform.h>
 #include <public/sysctl.h>
 
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index bb86a1c161b3..a058c435878a 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -16,32 +16,31 @@
  *    Mikael Pettersson    :    PM converted to driver model.
  */
 
-#include <xen/perfc.h>
+#include <xen/delay.h>
 #include <xen/errno.h>
 #include <xen/init.h>
+#include <xen/irq.h>
+#include <xen/kexec.h>
 #include <xen/mm.h>
 #include <xen/param.h>
+#include <xen/perfc.h>
 #include <xen/sched.h>
-#include <xen/irq.h>
-#include <xen/delay.h>
 #include <xen/smp.h>
 #include <xen/softirq.h>
 
+#include <asm/apic.h>
+#include <asm/atomic.h>
+#include <asm/flushtlb.h>
+#include <asm/genapic.h>
+#include <asm/guest.h>
+#include <asm/hardirq.h>
 #include <asm/io-ports.h>
+#include <asm/io_apic.h>
 #include <asm/irq-vectors.h>
 #include <asm/mc146818rtc.h>
 #include <asm/microcode.h>
-#include <asm/msr.h>
-#include <asm/atomic.h>
 #include <asm/mpspec.h>
-#include <asm/flushtlb.h>
-#include <asm/hardirq.h>
-#include <asm/apic.h>
-#include <asm/io_apic.h>
-#include <asm/genapic.h>
-
-#include <xen/kexec.h>
-#include <asm/guest.h>
+#include <asm/msr.h>
 #include <asm/nmi.h>
 #include <asm/time.h>
 
diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index f7bd0d777289..59b5828fa9e9 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -1,18 +1,16 @@
+#include <xen/bitops.h>
 #include <xen/init.h>
 #include <xen/kernel.h>
 #include <xen/sched.h>
-#include <xen/string.h>
-#include <xen/bitops.h>
 #include <xen/smp.h>
+#include <xen/string.h>
 
-#include <asm/intel-family.h>
-#include <asm/processor.h>
-#include <asm/msr.h>
-#include <asm/mwait.h>
-#include <asm/uaccess.h>
-#include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <asm/i387.h>
+#include <asm/intel-family.h>
+#include <asm/mpspec.h>
+#include <asm/msr.h>
+#include <asm/processor.h>
 #include <asm/trampoline.h>
 
 #include "cpu.h"
diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c
index 9ee54c625a90..c733a672d1e0 100644
--- a/xen/arch/x86/cpu/mwait-idle.c
+++ b/xen/arch/x86/cpu/mwait-idle.c
@@ -42,18 +42,20 @@
 /* un-comment DEBUG to enable pr_debug() statements */
 #define DEBUG
 
-#include <xen/lib.h>
 #include <xen/cpu.h>
 #include <xen/init.h>
+#include <xen/lib.h>
 #include <xen/param.h>
 #include <xen/softirq.h>
 #include <xen/trace.h>
+
 #include <asm/cpuidle.h>
 #include <asm/hpet.h>
 #include <asm/intel-family.h>
-#include <asm/mwait.h>
 #include <asm/msr.h>
+#include <asm/mwait.h>
 #include <asm/spec_ctrl.h>
+
 #include <acpi/cpufreq/cpufreq.h>
 
 #define MWAIT_IDLE_VERSION "0.4.1"
-- 
2.39.5