From patchwork Mon Mar 22 07:48:54 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Zhang, Rui" <rui.zhang@intel.com>
X-Patchwork-Id: 87373
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2M7lm4D032106
	for <patchwork-acpi@patchwork.kernel.org>;
	Mon, 22 Mar 2010 07:47:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753796Ab0CVHrr (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Mon, 22 Mar 2010 03:47:47 -0400
Received: from mga03.intel.com ([143.182.124.21]:17404 "EHLO mga03.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750889Ab0CVHrr (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Mon, 22 Mar 2010 03:47:47 -0400
Received: from azsmga001.ch.intel.com ([10.2.17.19])
	by azsmga101.ch.intel.com with ESMTP; 22 Mar 2010 00:47:46 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.51,286,1267430400"; d="scan'208";a="257189602"
Received: from rzhang1-desktop.sh.intel.com (HELO [10.239.36.107])
	([10.239.36.107])
	by azsmga001.ch.intel.com with ESMTP; 22 Mar 2010 00:47:45 -0700
Subject: [PATCH 2/2] ACPI: fixes a false alarm from lockdep
From: Zhang Rui <rui.zhang@intel.com>
To: "Brown, Len" <lenb@kernel.org>
Cc: "linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	"Li, Shaohua" <shaohua.li@intel.com>, "Zhang, Rui" <rui.zhang@intel.com>
Date: Mon, 22 Mar 2010 15:48:54 +0800
Message-ID: <1269244134.2205.1683.camel@rzhang1-desktop>
Mime-Version: 1.0
X-Mailer: Evolution 2.28.1 
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Mon, 22 Mar 2010 07:47:48 +0000 (UTC)


Index: linux-2.6/drivers/acpi/osl.c
===================================================================
--- linux-2.6.orig/drivers/acpi/osl.c	2010-03-19 09:34:33.000000000 +0800
+++ linux-2.6/drivers/acpi/osl.c	2010-03-19 09:36:00.000000000 +0800
@@ -758,7 +758,14 @@
 	queue = hp ? kacpi_hotplug_wq :
 		(type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq);
 	dpc->wait = hp ? 1 : 0;
-	INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+
+	if (queue == kacpi_hotplug_wq)
+		INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+	else if (queue == kacpi_notify_wq)
+		INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+	else
+		INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+
 	ret = queue_work(queue, &dpc->work);
 
 	if (!ret) {