On Tue, Jul 22, 2014 at 09:58:46PM -0400, Chen, Gong wrote:
> Remove XXX_FROZEN state from kvm.
> 
> Signed-off-by: Chen, Gong <gong.c...@linux.intel.com>
> ---
>  arch/x86/kernel/kvm.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
> index 3dd8e2c..22d472b 100644
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@ -442,19 +442,20 @@ static int kvm_cpu_notify(struct notifier_block *self, 
> unsigned long action,
>                         void *hcpu)
>  {
>       int cpu = (unsigned long)hcpu;
> -     switch (action) {
> +     switch (action & ~CPU_TASKS_FROZEN) {
>       case CPU_ONLINE:
> -     case CPU_DOWN_FAILED:

This looks strange. Why even touch CPU_DOWN_FAILED ...

> -     case CPU_ONLINE_FROZEN:
>               smp_call_function_single(cpu, kvm_guest_cpu_online, NULL, 0);
>               break;
>       case CPU_DOWN_PREPARE:
> -     case CPU_DOWN_PREPARE_FROZEN:
>               smp_call_function_single(cpu, kvm_guest_cpu_offline, NULL, 1);
>               break;
>       default:
>               break;
>       }
> +
> +     if (action == CPU_DOWN_FAILED)
> +             smp_call_function_single(cpu, kvm_guest_cpu_online, NULL, 0);

to move it here?

Just remove the _FROZEN stuff and don't touch anything else.

-- 
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to