|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2 03/16] x86: Sort headers
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
I'm disappointed to notice that this is the second time I've done this to
arch/x86/domain.c recently, and screwed it up the first time.
I think we need some tooling to help keep this in order, not that I remotely
have time to look into this.
---
xen/arch/x86/acpi/cpufreq/acpi.c | 2 +-
xen/arch/x86/cpu/mcheck/mce.h | 2 +-
xen/arch/x86/domain.c | 4 +-
xen/arch/x86/domctl.c | 44 ++++++++---------
xen/arch/x86/hvm/hvm.c | 76 +++++++++++++++---------------
xen/arch/x86/hvm/svm/svm.c | 6 +--
xen/arch/x86/hvm/svm/vmcb.c | 4 +-
xen/arch/x86/hvm/vmx/vmx.c | 54 +++++++++++----------
xen/arch/x86/hvm/vmx/vvmx.c | 6 +--
xen/arch/x86/include/asm/hvm/hvm.h | 2 +-
xen/arch/x86/tboot.c | 15 +++---
xen/arch/x86/xstate.c | 4 +-
xen/drivers/acpi/apei/apei-base.c | 14 +++---
13 files changed, 121 insertions(+), 112 deletions(-)
diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c
index 0c2537640608..b81f2afc9b9b 100644
--- a/xen/arch/x86/acpi/cpufreq/acpi.c
+++ b/xen/arch/x86/acpi/cpufreq/acpi.c
@@ -11,8 +11,8 @@
* porting acpi-cpufreq.c from Linux 2.6.23 to Xen hypervisor
*/
-#include <xen/errno.h>
#include <xen/delay.h>
+#include <xen/errno.h>
#include <xen/param.h>
#include <xen/types.h>
diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h
index eba4b536c797..6157a41aaeea 100644
--- a/xen/arch/x86/cpu/mcheck/mce.h
+++ b/xen/arch/x86/cpu/mcheck/mce.h
@@ -7,8 +7,8 @@
#include <xen/sched.h>
#include <xen/smp.h>
-#include <asm/traps.h>
#include <asm/atomic.h>
+#include <asm/traps.h>
#include "x86_mca.h"
#include "mctelem.h"
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 28c91cf023f1..6e3fd35c934e 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -24,11 +24,13 @@
#include <xen/hypercall.h>
#include <xen/init.h>
#include <xen/iocap.h>
+#include <xen/iommu.h>
#include <xen/irq.h>
#include <xen/kernel.h>
#include <xen/lib.h>
#include <xen/livepatch.h>
#include <xen/multicall.h>
+#include <xen/numa.h>
#include <xen/paging.h>
#include <xen/pci.h>
#include <xen/percpu.h>
@@ -64,8 +66,6 @@
#include <asm/system.h>
#include <asm/traps.h>
#include <asm/xstate.h>
-#include <xen/iommu.h>
-#include <xen/numa.h>
#include <public/arch-x86/cpuid.h>
#include <public/sysctl.h>
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index f07cae6a70b8..d7781b7dc5fd 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -4,39 +4,41 @@
* Copyright (c) 2002-2006, K A Fraser
*/
-#include <xen/types.h>
-#include <xen/lib.h>
-#include <xen/mm.h>
-#include <xen/guest_access.h>
#include <xen/compat.h>
-#include <xen/pci.h>
-#include <public/domctl.h>
-#include <xen/sched.h>
+#include <xen/console.h>
#include <xen/domain.h>
-#include <xen/event.h>
#include <xen/domain_page.h>
-#include <asm/msr.h>
-#include <xen/trace.h>
-#include <xen/console.h>
+#include <xen/event.h>
+#include <xen/guest_access.h>
+#include <xen/hypercall.h>
#include <xen/iocap.h>
+#include <xen/iommu.h>
+#include <xen/lib.h>
+#include <xen/mm.h>
#include <xen/paging.h>
+#include <xen/pci.h>
+#include <xen/sched.h>
+#include <xen/trace.h>
+#include <xen/types.h>
+#include <xen/vm_event.h>
+#include <asm/acpi.h>
+#include <asm/cpu-policy.h>
#include <asm/gdbsx.h>
-#include <asm/irq.h>
#include <asm/hvm/emulate.h>
#include <asm/hvm/hvm.h>
+#include <asm/io_apic.h>
+#include <asm/irq.h>
+#include <asm/mem_sharing.h>
+#include <asm/msr.h>
#include <asm/processor.h>
-#include <asm/acpi.h> /* for hvm_acpi_power_button */
-#include <xen/hypercall.h> /* for arch_do_domctl */
+#include <asm/psr.h>
+#include <asm/xstate.h>
+
#include <xsm/xsm.h>
-#include <xen/iommu.h>
-#include <xen/vm_event.h>
+
+#include <public/domctl.h>
#include <public/vm_event.h>
-#include <asm/mem_sharing.h>
-#include <asm/xstate.h>
-#include <asm/psr.h>
-#include <asm/cpu-policy.h>
-#include <asm/io_apic.h>
static int update_domain_cpu_policy(struct domain *d,
xen_domctl_cpu_policy_t *xdpc)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index cb8ecd050d41..6d2b937b62ba 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -7,64 +7,66 @@
* Copyright (c) 2008, Citrix Systems, Inc.
*/
+#include <xen/console.h>
+#include <xen/cpu.h>
+#include <xen/domain.h>
+#include <xen/domain_page.h>
+#include <xen/event.h>
+#include <xen/guest_access.h>
+#include <xen/hypercall.h>
#include <xen/init.h>
#include <xen/io.h>
#include <xen/ioreq.h>
-#include <xen/lib.h>
-#include <xen/trace.h>
-#include <xen/sched.h>
#include <xen/irq.h>
-#include <xen/softirq.h>
-#include <xen/domain.h>
-#include <xen/domain_page.h>
-#include <xen/hypercall.h>
-#include <xen/guest_access.h>
-#include <xen/event.h>
-#include <xen/cpu.h>
-#include <xen/wait.h>
+#include <xen/lib.h>
#include <xen/mem_access.h>
-#include <xen/rangeset.h>
#include <xen/monitor.h>
-#include <xen/param.h>
-#include <xen/warning.h>
-#include <xen/vpci.h>
#include <xen/nospec.h>
+#include <xen/param.h>
+#include <xen/rangeset.h>
+#include <xen/sched.h>
+#include <xen/softirq.h>
+#include <xen/trace.h>
#include <xen/vm_event.h>
-#include <xen/console.h>
-#include <asm/shadow.h>
-#include <asm/hap.h>
+#include <xen/vpci.h>
+#include <xen/wait.h>
+#include <xen/warning.h>
+
+#include <asm/altp2m.h>
+#include <asm/apic.h>
+#include <asm/cpufeature.h>
#include <asm/current.h>
#include <asm/debugreg.h>
#include <asm/e820.h>
-#include <asm/regs.h>
-#include <asm/cpufeature.h>
-#include <asm/processor.h>
-#include <asm/msr.h>
-#include <asm/i387.h>
-#include <asm/xstate.h>
-#include <asm/traps.h>
-#include <asm/mc146818rtc.h>
-#include <asm/mce.h>
-#include <asm/monitor.h>
+#include <asm/hap.h>
+#include <asm/hvm/cacheattr.h>
#include <asm/hvm/emulate.h>
#include <asm/hvm/hvm.h>
-#include <asm/hvm/vpt.h>
-#include <asm/hvm/support.h>
-#include <asm/hvm/cacheattr.h>
-#include <asm/hvm/nestedhvm.h>
#include <asm/hvm/monitor.h>
+#include <asm/hvm/nestedhvm.h>
+#include <asm/hvm/support.h>
#include <asm/hvm/viridian.h>
#include <asm/hvm/vm_event.h>
-#include <asm/altp2m.h>
+#include <asm/hvm/vpt.h>
+#include <asm/i387.h>
+#include <asm/mc146818rtc.h>
+#include <asm/mce.h>
+#include <asm/monitor.h>
+#include <asm/msr.h>
#include <asm/mtrr.h>
-#include <asm/apic.h>
+#include <asm/processor.h>
+#include <asm/regs.h>
+#include <asm/shadow.h>
+#include <asm/traps.h>
#include <asm/vm_event.h>
-#include <public/sched.h>
+#include <asm/xstate.h>
+
+#include <public/arch-x86/cpuid.h>
#include <public/hvm/ioreq.h>
-#include <public/version.h>
#include <public/memory.h>
+#include <public/sched.h>
+#include <public/version.h>
#include <public/vm_event.h>
-#include <public/arch-x86/cpuid.h>
#include <compat/hvm/hvm_op.h>
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 57520ac3ec2d..a807cab305aa 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -18,7 +18,6 @@
#include <asm/cpufeature.h>
#include <asm/current.h>
#include <asm/debugreg.h>
-#include <asm/idt.h>
#include <asm/gdbsx.h>
#include <asm/hvm/emulate.h>
#include <asm/hvm/hvm.h>
@@ -29,13 +28,14 @@
#include <asm/hvm/svm/svm.h>
#include <asm/hvm/svm/svmdebug.h>
#include <asm/hvm/svm/vmcb.h>
-#include <asm/iocap.h>
#include <asm/i387.h>
+#include <asm/idt.h>
+#include <asm/iocap.h>
#include <asm/monitor.h>
#include <asm/msr.h>
+#include <asm/p2m.h>
#include <asm/paging.h>
#include <asm/processor.h>
-#include <asm/p2m.h>
#include <asm/x86_emulate.h>
#include <asm/xenoprof.h>
diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c
index 839d3ff91b5a..e4c797608f25 100644
--- a/xen/arch/x86/hvm/svm/vmcb.c
+++ b/xen/arch/x86/hvm/svm/vmcb.c
@@ -14,11 +14,11 @@
#include <xen/sched.h>
#include <xen/softirq.h>
+#include <asm/hvm/svm/svm.h>
+#include <asm/hvm/svm/svmdebug.h>
#include <asm/hvm/svm/vmcb.h>
#include <asm/msr-index.h>
#include <asm/p2m.h>
-#include <asm/hvm/svm/svm.h>
-#include <asm/hvm/svm/svmdebug.h>
#include <asm/spec_ctrl.h>
struct vmcb_struct *alloc_vmcb(void)
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 6341fa20457c..c6bf435b744a 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -4,51 +4,53 @@
* Copyright (c) 2004, Intel Corporation.
*/
+#include <xen/domain_page.h>
#include <xen/guest_access.h>
+#include <xen/hypercall.h>
#include <xen/init.h>
+#include <xen/irq.h>
#include <xen/lib.h>
#include <xen/param.h>
-#include <xen/trace.h>
+#include <xen/perfc.h>
#include <xen/sched.h>
-#include <xen/irq.h>
#include <xen/softirq.h>
-#include <xen/domain_page.h>
-#include <xen/hypercall.h>
-#include <xen/perfc.h>
-#include <asm/current.h>
-#include <asm/io.h>
-#include <asm/iocap.h>
-#include <asm/regs.h>
+#include <xen/trace.h>
+
+#include <asm/altp2m.h>
+#include <asm/apic.h>
#include <asm/cpufeature.h>
-#include <asm/processor.h>
+#include <asm/current.h>
#include <asm/debugreg.h>
-#include <asm/msr.h>
-#include <asm/p2m.h>
-#include <asm/mem_sharing.h>
+#include <asm/event.h>
+#include <asm/gdbsx.h>
#include <asm/hvm/emulate.h>
#include <asm/hvm/hvm.h>
+#include <asm/hvm/monitor.h>
+#include <asm/hvm/nestedhvm.h>
#include <asm/hvm/support.h>
-#include <asm/hvm/vmx/vmx.h>
-#include <asm/hvm/vmx/vmcs.h>
-#include <public/sched.h>
-#include <public/hvm/ioreq.h>
#include <asm/hvm/vlapic.h>
-#include <asm/x86_emulate.h>
+#include <asm/hvm/vmx/vmcs.h>
+#include <asm/hvm/vmx/vmx.h>
#include <asm/hvm/vpt.h>
-#include <public/hvm/save.h>
-#include <asm/hvm/monitor.h>
-#include <asm/xenoprof.h>
-#include <asm/gdbsx.h>
-#include <asm/apic.h>
-#include <asm/hvm/nestedhvm.h>
-#include <asm/altp2m.h>
-#include <asm/event.h>
+#include <asm/io.h>
+#include <asm/iocap.h>
#include <asm/mce.h>
+#include <asm/mem_sharing.h>
#include <asm/monitor.h>
+#include <asm/msr.h>
+#include <asm/p2m.h>
+#include <asm/processor.h>
#include <asm/prot-key.h>
+#include <asm/regs.h>
#include <asm/spec_ctrl.h>
#include <asm/stubs.h>
+#include <asm/x86_emulate.h>
+#include <asm/xenoprof.h>
+
#include <public/arch-x86/cpuid.h>
+#include <public/hvm/ioreq.h>
+#include <public/hvm/save.h>
+#include <public/sched.h>
static bool __initdata opt_force_ept;
boolean_param("force-ept", opt_force_ept);
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 2432af58e0e0..95d3c2ee7b79 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -10,12 +10,12 @@
#include <xen/ioreq.h>
-#include <asm/mtrr.h>
-#include <asm/p2m.h>
+#include <asm/hvm/nestedhvm.h>
#include <asm/hvm/support.h>
#include <asm/hvm/vmx/vmx.h>
#include <asm/hvm/vmx/vvmx.h>
-#include <asm/hvm/nestedhvm.h>
+#include <asm/mtrr.h>
+#include <asm/p2m.h>
static DEFINE_PER_CPU(u64 *, vvmcs_buf);
diff --git a/xen/arch/x86/include/asm/hvm/hvm.h
b/xen/arch/x86/include/asm/hvm/hvm.h
index 18e40910ff71..228f47dbde8b 100644
--- a/xen/arch/x86/include/asm/hvm/hvm.h
+++ b/xen/arch/x86/include/asm/hvm/hvm.h
@@ -14,8 +14,8 @@
#include <asm/asm_defns.h>
#include <asm/current.h>
-#include <asm/x86_emulate.h>
#include <asm/hvm/asid.h>
+#include <asm/x86_emulate.h>
struct pirq; /* needed by pi_update_irte */
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index d5db60d335e3..319116857d4a 100644
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -1,19 +1,20 @@
+#include <xen/acpi.h>
+#include <xen/domain_page.h>
#include <xen/efi.h>
#include <xen/init.h>
-#include <xen/types.h>
+#include <xen/iommu.h>
#include <xen/lib.h>
#include <xen/param.h>
-#include <xen/sched.h>
-#include <xen/domain_page.h>
-#include <xen/iommu.h>
-#include <xen/acpi.h>
#include <xen/pfn.h>
+#include <xen/sched.h>
+#include <xen/types.h>
+
+#include <asm/e820.h>
#include <asm/fixmap.h>
#include <asm/page.h>
#include <asm/processor.h>
-#include <asm/e820.h>
-#include <asm/tboot.h>
#include <asm/setup.h>
+#include <asm/tboot.h>
#include <asm/trampoline.h>
#include <crypto/vmac.h>
diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c
index e8e218caed36..f6d677eb121d 100644
--- a/xen/arch/x86/xstate.c
+++ b/xen/arch/x86/xstate.c
@@ -10,12 +10,12 @@
#include <xen/sched.h>
#include <xen/xvmalloc.h>
+#include <asm/asm_defns.h>
#include <asm/cpu-policy.h>
#include <asm/current.h>
-#include <asm/processor.h>
#include <asm/i387.h>
+#include <asm/processor.h>
#include <asm/xstate.h>
-#include <asm/asm_defns.h>
/*
* Maximum size (in byte) of the XSAVE/XRSTOR save area required by all
diff --git a/xen/drivers/acpi/apei/apei-base.c
b/xen/drivers/acpi/apei/apei-base.c
index 053a92c307bb..4fe99573a220 100644
--- a/xen/drivers/acpi/apei/apei-base.c
+++ b/xen/drivers/acpi/apei/apei-base.c
@@ -30,15 +30,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
-#include <xen/kernel.h>
-#include <xen/errno.h>
+
+#include <xen/cper.h>
#include <xen/delay.h>
-#include <xen/string.h>
-#include <xen/types.h>
-#include <xen/spinlock.h>
+#include <xen/errno.h>
#include <xen/init.h>
-#include <xen/cper.h>
+#include <xen/kernel.h>
+#include <xen/spinlock.h>
+#include <xen/string.h>
+
#include <asm/io.h>
+
#include <acpi/acpi.h>
#include <acpi/apei.h>
--
2.39.5
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |