... in preparation for a logical change. No functional change.
Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Julien Grall <[email protected]> CC: Volodymyr Babchuk <[email protected]> CC: Bertrand Marquis <[email protected]> CC: Michal Orzel <[email protected]> CC: Oleksii Kurochko <[email protected]> --- xen/arch/x86/emul-i8254.c | 12 +++++------ xen/arch/x86/time.c | 42 ++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 144aa168a3f0..c16ed0bead87 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -24,19 +24,19 @@ * IN THE SOFTWARE. */ -#include <xen/types.h> -#include <xen/mm.h> -#include <xen/xmalloc.h> -#include <xen/lib.h> #include <xen/errno.h> +#include <xen/lib.h> +#include <xen/mm.h> #include <xen/sched.h> #include <xen/trace.h> -#include <asm/time.h> +#include <xen/xmalloc.h> + +#include <asm/current.h> #include <asm/hvm/hvm.h> #include <asm/hvm/io.h> #include <asm/hvm/save.h> #include <asm/hvm/vpt.h> -#include <asm/current.h> +#include <asm/time.h> #define domain_vpit(x) (&(x)->arch.vpit) #define vcpu_vpit(x) (domain_vpit((x)->domain)) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index ece9ae0b342e..1aeb144c837a 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -9,38 +9,40 @@ * Copyright (c) 1991, 1992, 1995 Linus Torvalds */ +#include <xen/cpuidle.h> +#include <xen/efi.h> #include <xen/errno.h> #include <xen/event.h> -#include <xen/sched.h> -#include <xen/lib.h> +#include <xen/guest_access.h> #include <xen/init.h> -#include <xen/param.h> -#include <xen/time.h> -#include <xen/timer.h> -#include <xen/smp.h> #include <xen/irq.h> +#include <xen/keyhandler.h> +#include <xen/lib.h> +#include <xen/param.h> #include <xen/pci_ids.h> +#include <xen/sched.h> +#include <xen/smp.h> #include <xen/softirq.h> -#include <xen/efi.h> -#include <xen/cpuidle.h> #include <xen/symbols.h> -#include <xen/keyhandler.h> -#include <xen/guest_access.h> +#include <xen/time.h> +#include <xen/timer.h> + +#include <asm/acpi.h> #include <asm/apic.h> -#include <asm/io.h> -#include <asm/iocap.h> -#include <asm/msr.h> -#include <asm/mpspec.h> -#include <asm/processor.h> +#include <asm/div64.h> #include <asm/fixmap.h> #include <asm/guest.h> -#include <asm/mc146818rtc.h> -#include <asm/mwait.h> -#include <asm/div64.h> -#include <asm/acpi.h> #include <asm/hpet.h> #include <asm/io-ports.h> -#include <asm/setup.h> /* for early_time_init */ +#include <asm/io.h> +#include <asm/iocap.h> +#include <asm/mc146818rtc.h> +#include <asm/mpspec.h> +#include <asm/msr.h> +#include <asm/mwait.h> +#include <asm/processor.h> +#include <asm/setup.h> + #include <public/arch-x86/cpuid.h> /* opt_clocksource: Force clocksource to one of: pit, hpet, acpi. */ -- 2.39.5
