From patchwork Mon Jan 24 08:00:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 500501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0O805jI016671 for ; Mon, 24 Jan 2011 08:00:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871Ab1AXIAD (ORCPT ); Mon, 24 Jan 2011 03:00:03 -0500 Received: from mga01.intel.com ([192.55.52.88]:13510 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751861Ab1AXIAD (ORCPT ); Mon, 24 Jan 2011 03:00:03 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 24 Jan 2011 00:00:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.60,369,1291622400"; d="scan'208";a="880310878" Received: from sli10-conroe.sh.intel.com (HELO [10.239.36.124]) ([10.239.36.124]) by fmsmga001.fm.intel.com with ESMTP; 24 Jan 2011 00:00:02 -0800 Subject: [PATCH] fix a shutdown regression in intel_idle From: Shaohua Li To: Len Brown Cc: linux acpi , ari.m.savolainen@gmail.com Date: Mon, 24 Jan 2011 16:00:01 +0800 Message-ID: <1295856001.1949.956.camel@sli10-conroe> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 24 Jan 2011 08:00:57 +0000 (UTC) diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 7acb32e..1fa091e 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -263,7 +263,7 @@ static void __setup_broadcast_timer(void *arg) clockevents_notify(reason, &cpu); } -static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n, +static int setup_broadcast_cpuhp_notify(struct notifier_block *n, unsigned long action, void *hcpu) { int hotcpu = (unsigned long)hcpu; @@ -273,15 +273,11 @@ static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n, smp_call_function_single(hotcpu, __setup_broadcast_timer, (void *)true, 1); break; - case CPU_DOWN_PREPARE: - smp_call_function_single(hotcpu, __setup_broadcast_timer, - (void *)false, 1); - break; } return NOTIFY_OK; } -static struct notifier_block __cpuinitdata setup_broadcast_notifier = { +static struct notifier_block setup_broadcast_notifier = { .notifier_call = setup_broadcast_cpuhp_notify, };