Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932422AbcDKNYB (ORCPT ); Mon, 11 Apr 2016 09:24:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:37483 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932362AbcDKNX5 (ORCPT ); Mon, 11 Apr 2016 09:23:57 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dirk Brandewie , "Rafael J . Wysocki" , Jiri Slaby Subject: [PATCH 3.12 22/98] intel_pstate: Use del_timer_sync in intel_pstate_cpu_stop Date: Mon, 11 Apr 2016 15:22:24 +0200 Message-Id: X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1271 Lines: 37 From: Dirk Brandewie 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit c2294a2f7853e6450361d078b65407bdaa6d1d11 upstream. Ensure that no timer callback is running since we are about to free the timer structure. We cannot guarantee that the call back is called on the CPU where the timer is running. Reported-by: Thomas Gleixner Signed-off-by: Dirk Brandewie Reviewed-by: Srivatsa S. Bhat Acked-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki Signed-off-by: Jiri Slaby --- drivers/cpufreq/intel_pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 132a9139c19f..a8056af80999 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -635,7 +635,7 @@ static int intel_pstate_cpu_exit(struct cpufreq_policy *policy) { int cpu = policy->cpu; - del_timer(&all_cpu_data[cpu]->timer); + del_timer_sync(&all_cpu_data[cpu]->timer); kfree(all_cpu_data[cpu]); all_cpu_data[cpu] = NULL; return 0; -- 2.8.1