diff options
| author |   Zachary Amsden <zamsden@redhat.com> | 2009-09-29 11:38:34 -1000 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-12-03 09:32:12 +0200 |
| commit | b820cc0ca20fdcf8014d8e57421cf29095e39392 (patch) | |
| tree | 15df0ebf5d62a2842a55963c549dd4b3b5c21152 /arch/x86/kvm/x86.c | |
| parent | KVM: fix lock imbalance in kvm_*_irq_source_id() (diff) | |
| download | linux-dev-b820cc0ca20fdcf8014d8e57421cf29095e39392.tar.xz linux-dev-b820cc0ca20fdcf8014d8e57421cf29095e39392.zip | |
KVM: Separate timer intialization into an indepedent function
Signed-off-by: Zachary Amsden <zamsden@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kvm/x86.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3d83de8bcbf4..6a31dfb8849c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3118,9 +3118,22 @@ static struct notifier_block kvmclock_cpufreq_notifier_block = { .notifier_call = kvmclock_cpufreq_notifier }; +static void kvm_timer_init(void) +{ + int cpu; + + for_each_possible_cpu(cpu) + per_cpu(cpu_tsc_khz, cpu) = tsc_khz; + if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) { + tsc_khz_ref = tsc_khz; + cpufreq_register_notifier(&kvmclock_cpufreq_notifier_block, + CPUFREQ_TRANSITION_NOTIFIER); + } +} + int kvm_arch_init(void *opaque) { - int r, cpu; + int r; struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; if (kvm_x86_ops) { @@ -3152,13 +3165,7 @@ int kvm_arch_init(void *opaque) kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, PT_DIRTY_MASK, PT64_NX_MASK, 0); - for_each_possible_cpu(cpu) - per_cpu(cpu_tsc_khz, cpu) = tsc_khz; - if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) { - tsc_khz_ref = tsc_khz; - cpufreq_register_notifier(&kvmclock_cpufreq_notifier_block, - CPUFREQ_TRANSITION_NOTIFIER); - } + kvm_timer_init(); return 0; |