diff options
| author | Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp> | 2014-02-18 19:09:11 +0900 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-22 15:53:32 +0100 |
| commit | 0d75de4a65d99ba042b050620d479ab74b1919d4 (patch) | |
| tree | dce9e5dfa2de849b7ec1b15f3a8834c4035d95a2 /arch/x86 | |
| parent | f303b4ce8b386558b2b92aeb0c6af96685fcd4b2 (diff) | |
| download | linux-0d75de4a65d99ba042b050620d479ab74b1919d4.tar.gz linux-0d75de4a65d99ba042b050620d479ab74b1919d4.tar.bz2 linux-0d75de4a65d99ba042b050620d479ab74b1919d4.zip | |
kvm: remove redundant registration of BSP's hv_clock area
These days hv_clock allocation is memblock based (i.e. the percpu
allocator is not involved), which means that the physical address
of each of the per-cpu hv_clock areas is guaranteed to remain
unchanged through all its lifetime and we do not need to update
its location after CPU bring-up.
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 713f1b3bad52..0331cb389d68 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -417,7 +417,6 @@ void kvm_disable_steal_time(void) #ifdef CONFIG_SMP static void __init kvm_smp_prepare_boot_cpu(void) { - WARN_ON(kvm_register_clock("primary cpu clock")); kvm_guest_cpu_init(); native_smp_prepare_boot_cpu(); kvm_spinlock_init(); diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index e6041094ff26..d9156ceecdff 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -242,7 +242,7 @@ void __init kvmclock_init(void) hv_clock = __va(mem); memset(hv_clock, 0, size); - if (kvm_register_clock("boot clock")) { + if (kvm_register_clock("primary cpu clock")) { hv_clock = NULL; memblock_free(mem, size); return; |