Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934237AbZLJL5X (ORCPT ); Thu, 10 Dec 2009 06:57:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934093AbZLJL5R (ORCPT ); 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 ); Thu, 10 Dec 2009 06:57:16 -0500 From: Xiaotian Feng To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Xiaotian Feng , Len Brown , Bob Moore , Lin Ming , Alexey Starikovskiy , Pavel Machek 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1727 Lines: 43 commit 8bd108d adds preemption point after each opcode parse, then a sleeping function called from invalid context bug was founded during suspend/resume stage. this was fixed in commit abe1dfa by don't cond_resched when irq_disabled. But recent commit 138d156 changes the behaviour to don't cond_resched when in_atomic. This makes the sleeping function called from invalid context bug happen again, which is reported in http://lkml.org/lkml/2009/12/1/371. This patch also fixes http://bugzilla.kernel.org/show_bug.cgi?id=14483 Reported-and-bisected-by: Larry Finger Reported-and-bisected-by: Justin P. Mattock Signed-off-by: Xiaotian Feng Cc: Len Brown Cc: Bob Moore Cc: Lin Ming Cc: Alexey Starikovskiy Cc: Pavel Machek --- include/acpi/platform/aclinux.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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) -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/