From patchwork Sat Jan 23 19:14:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 74908 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0NJEfco010586 for ; Sat, 23 Jan 2010 19:14:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756257Ab0AWTOb (ORCPT ); Sat, 23 Jan 2010 14:14:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756248Ab0AWTOb (ORCPT ); Sat, 23 Jan 2010 14:14:31 -0500 Received: from vms173019pub.verizon.net ([206.46.173.19]:34808 "EHLO vms173019pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756057Ab0AWTOa (ORCPT ); Sat, 23 Jan 2010 14:14:30 -0500 Received: from localhost.localdomain ([unknown] [74.104.151.18]) by vms173019.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0KWP00AECS3PBRR1@vms173019.mailsrvcs.net>; Sat, 23 Jan 2010 13:14:18 -0600 (CST) Received: from localhost.localdomain (d975xbx2 [127.0.0.1]) by localhost.localdomain (8.14.2/8.14.2) with ESMTP id o0NJECqm005183; Sat, 23 Jan 2010 14:14:12 -0500 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.2/8.14.2/Submit) with ESMTP id o0NJEBRk005178; Sat, 23 Jan 2010 14:14:11 -0500 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Sat, 23 Jan 2010 14:14:11 -0500 (EST) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: stable@kernel.org Cc: Larry Finger , "Justin P. Mattock" , Xiaotian Feng , Alexey Starikovskiy , linux-acpi@vger.kernel.org, Linux Kernel Mailing List Subject: [PATCH 2.6.32.stable] ACPI: don't cond_resched if irq is disabled Message-id: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII 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..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 #define ACPI_PREEMPTION_POINT() \ do { \ - if (!in_atomic_preempt_off()) \ + if (!in_atomic_preempt_off() && !irqs_disabled()) \ cond_resched(); \ } while (0)