From patchwork Thu Dec 10 11:56:45 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiaotian Feng <dfeng@redhat.com>
X-Patchwork-Id: 66236
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBABvPXl003562
	for <patchwork-acpi@patchwork.kernel.org>;
	Thu, 10 Dec 2009 11:57:26 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S934161AbZLJL5R (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Thu, 10 Dec 2009 06:57:17 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934125AbZLJL5R
	(ORCPT <rfc822;linux-acpi-outgoing>);
	Thu, 10 Dec 2009 06:57:17 -0500
Received: from mx1.redhat.com ([209.132.183.28]:22600 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S934007AbZLJL5Q (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Thu, 10 Dec 2009 06:57:16 -0500
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBABudgk010854
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Thu, 10 Dec 2009 06:56:39 -0500
Received: from localhost.localdomain (dhcp-65-132.nay.redhat.com
	[10.66.65.132])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id nBABuZGX006537; Thu, 10 Dec 2009 06:56:36 -0500
From: Xiaotian Feng <dfeng@redhat.com>
To: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Xiaotian Feng <dfeng@redhat.com>,
	Len Brown <lenb@kernel.org>, Bob Moore <robert.moore@intel.com>,
	Lin Ming <ming.m.lin@intel.com>,
	Alexey Starikovskiy <astarikovskiy@suse.de>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH -V2] acpi: don't cond_resched if irq is disabled
Date: Thu, 10 Dec 2009 19:56:45 +0800
Message-Id: <1260446205-16868-1-git-send-email-dfeng@redhat.com>
In-Reply-To: <20091210100907.GA2446@ucw.cz>
References: <20091210100907.GA2446@ucw.cz>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org


diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 9d7febd..0946997 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
 	do { \
-		if (!in_atomic_preempt_off()) \
+		if (!in_atomic_preempt_off() && !irqs_disabled()) \
 			cond_resched(); \
 	} while (0)