Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757445AbaGWCix (ORCPT ); Tue, 22 Jul 2014 22:38:53 -0400 Received: from mga01.intel.com ([192.55.52.88]:21023 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755475AbaGWCiv (ORCPT ); Tue, 22 Jul 2014 22:38:51 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="363779165" From: "Chen, Gong" To: linux-kernel@vger.kernel.org Cc: mingo@kernel.org, tglx@linutronix.de, paulus@samba.org, benh@kernel.crashing.org, tony.luck@intel.com, hpa@zytor.com, jkosina@suse.cz, rafael.j.wysocki@intel.com, bp@alien8.de, linux@arm.linux.org.uk, ralf@linux-mips.org, schwidefsky@de.ibm.com, davem@davemloft.net, viro@zeniv.linux.org.uk, fweisbec@gmail.com, cl@linux.com, akpm@linux-foundation.org, axboe@kernel.dk, JBottomley@parallels.com, neilb@suse.de, christoffer.dall@linaro.org, rostedt@goodmis.org, rric@kernel.org, gregkh@linuxfoundation.org, mhocko@suse.cz, david@fromorbit.com, "Chen, Gong" Subject: [RFC PATCH v1 62/70] virt, kvm, arm, arch_timer: _FROZEN Cleanup Date: Tue, 22 Jul 2014 21:59:38 -0400 Message-Id: <1406080786-3938-63-git-send-email-gong.chen@linux.intel.com> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1406080786-3938-1-git-send-email-gong.chen@linux.intel.com> References: <1406080786-3938-1-git-send-email-gong.chen@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove XXX_FROZEN state from kvm/arm/arch_timer. Signed-off-by: Chen, Gong --- virt/kvm/arm/arch_timer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 22fa819..169512d 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -220,13 +220,11 @@ u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid) static int kvm_timer_cpu_notify(struct notifier_block *self, unsigned long action, void *cpu) { - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_STARTING: - case CPU_STARTING_FROZEN: kvm_timer_init_interrupt(NULL); break; case CPU_DYING: - case CPU_DYING_FROZEN: disable_percpu_irq(host_vtimer_irq); break; } -- 2.0.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/