Re: [patch 31/66] x86/kvm/kvmclock: Convert to hotplug state machine

[Anna-Maria Gleixner]

On Mon, 11 Jul 2016, Anna-Maria Gleixner wrote:

> @@ -5896,7 +5877,7 @@ void kvm_arch_exit(void)
>       if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
>               cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block,
>                                           CPUFREQ_TRANSITION_NOTIFIER);
> -     unregister_hotcpu_notifier(&kvmclock_cpu_notifier_block);
> +     cpuhp_remove_state_nocalls(CPUHP_X86_KVM_CLK_ONLINE);

I'm sorry, this is buggy and wants to be:

    cpuhp_remove_state_nocalls(CPUHP_AP_X86_KVM_CLK_ONLINE);

See delta patch below.

    Anna-Maria

8<-----------------

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5877,7 +5877,7 @@ void kvm_arch_exit(void)
        if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
                cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block,
                                            CPUFREQ_TRANSITION_NOTIFIER);
-       cpuhp_remove_state_nocalls(CPUHP_X86_KVM_CLK_ONLINE);
+       cpuhp_remove_state_nocalls(CPUHP_AP_X86_KVM_CLK_ONLINE);
 #ifdef CONFIG_X86_64
        pvclock_gtod_unregister_notifier(&pvclock_gtod_notifier);
 #endif