lkml.org 
[lkml]   [2009]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2: kvm 1/4] Code motion. Separate timer intialization into an indepedent function.
    Date
    Signed-off-by: Zachary Amsden <zamsden@redhat.com>
    ---
    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 fedac9d..15d2ace 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -3116,9 +3116,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) {
    @@ -3150,13 +3163,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;

    --
    1.6.4.4


    \
     
     \ /
      Last update: 2009-09-29 06:09    [W:2.616 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site