From patchwork Fri Jan 21 22:42:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 496921 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 p0LMgYEV022478 for ; Fri, 21 Jan 2011 22:42:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522Ab1AUWmc (ORCPT ); Fri, 21 Jan 2011 17:42:32 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:41155 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750889Ab1AUWmb (ORCPT ); Fri, 21 Jan 2011 17:42:31 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 48D021A2CC7; Fri, 21 Jan 2011 23:26:44 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04824-01; Fri, 21 Jan 2011 23:26:24 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 17DFC1A2A6E; Fri, 21 Jan 2011 23:26:24 +0100 (CET) From: "Rafael J. Wysocki" To: Linus Torvalds Subject: Re: Occasional (too common) suspend problem Date: Fri, 21 Jan 2011 23:42:01 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc1+; KDE/4.4.4; x86_64; ; ) Cc: Len Brown , Jeff Chua , ACPI Devel Maling List , "Linux-pm mailing list" References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201101212342.01646.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux 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]); Fri, 21 Jan 2011 22:42:35 +0000 (UTC) Index: linux-2.6/drivers/thermal/thermal_sys.c =================================================================== --- linux-2.6.orig/drivers/thermal/thermal_sys.c +++ linux-2.6/drivers/thermal/thermal_sys.c @@ -62,6 +62,20 @@ static DEFINE_MUTEX(thermal_list_lock); static unsigned int thermal_event_seqnum; +static struct workqueue_struct *thermal_wq; + +static int __init thermal_start_workqueue(void) +{ + thermal_wq = alloc_workqueue("thermal", WQ_FREEZEABLE, 0); + return thermal_wq ? 0 : -ENOMEM; +} + +static inline void thermal_destroy_workqueue(void) +{ + if (thermal_wq) + destroy_workqueue(thermal_wq); +} + static struct genl_family thermal_event_genl_family = { .id = GENL_ID_GENERATE, .name = THERMAL_GENL_FAMILY_NAME, @@ -611,10 +625,10 @@ static void thermal_zone_device_set_poll return; if (delay > 1000) - schedule_delayed_work(&(tz->poll_queue), + queue_delayed_work(thermal_wq, &(tz->poll_queue), round_jiffies(msecs_to_jiffies(delay))); else - schedule_delayed_work(&(tz->poll_queue), + queue_delayed_work(thermal_wq, &(tz->poll_queue), msecs_to_jiffies(delay)); } @@ -1306,11 +1320,14 @@ static int __init thermal_init(void) int result = 0; result = class_register(&thermal_class); + if (!result) + result = thermal_start_workqueue(); if (result) { idr_destroy(&thermal_tz_idr); idr_destroy(&thermal_cdev_idr); mutex_destroy(&thermal_idr_lock); mutex_destroy(&thermal_list_lock); + thermal_destroy_workqueue(); } result = genetlink_init(); return result; @@ -1328,6 +1345,7 @@ static void __exit thermal_exit(void) idr_destroy(&thermal_cdev_idr); mutex_destroy(&thermal_idr_lock); mutex_destroy(&thermal_list_lock); + thermal_destroy_workqueue(); genetlink_exit(); }