[PATCH] x86: setup_arch 64bit move kvmclock_init later
- Date: Mon, 23 Jun 2008 19:52:44 -0700
- From: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
- Subject: [PATCH] x86: setup_arch 64bit move kvmclock_init later
Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
---
arch/x86/kernel/setup_32.c | 32 ++++++++++++++++++--------------
arch/x86/kernel/setup_64.c | 14 +++++++-------
2 files changed, 25 insertions(+), 21 deletions(-)
Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_64.c
+++ linux-2.6/arch/x86/kernel/setup_64.c
@@ -296,10 +296,6 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();
-#ifdef CONFIG_KVM_CLOCK
- kvmclock_init();
-#endif
-
/*
* Initialize the ACPI boot-time table parser (gets the RSDP and SDT).
* Call this early for SRAT node setup.
@@ -342,6 +338,9 @@ void __init setup_arch(char **cmdline_p)
reserve_ibft_region();
+#ifdef CONFIG_KVM_CLOCK
+ kvmclock_init();
+#endif
paging_init();
map_vsyscall();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/