From patchwork Fri Dec 4 04:26:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaotian Feng X-Patchwork-Id: 64771 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 nB44QTq6022888 for ; Fri, 4 Dec 2009 04:26:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753922AbZLDE0V (ORCPT ); Thu, 3 Dec 2009 23:26:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755242AbZLDE0U (ORCPT ); Thu, 3 Dec 2009 23:26:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34390 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753922AbZLDE0U (ORCPT ); Thu, 3 Dec 2009 23:26:20 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB44PmFF023049 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 3 Dec 2009 23:25:48 -0500 Received: from localhost.localdomain (dhcp-65-132.nay.redhat.com [10.66.65.132]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB44Piij026127; Thu, 3 Dec 2009 23:25:45 -0500 From: Xiaotian Feng To: lenb@kernel.org, ming.m.lin@intel.com, robert.moore@intel.com, linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Xiaotian Feng Subject: [PATCH] ACPICA: don't cond_resched() when irq_disabled or in_atomic Date: Fri, 4 Dec 2009 12:26:00 +0800 Message-Id: <1259900760-6424-1-git-send-email-dfeng@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 9d7febd..5b415ee 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 #define ACPI_PREEMPTION_POINT() \ do { \ - if (!in_atomic_preempt_off()) \ + if (preemptible()) \ cond_resched(); \ } while (0)