lkml.org 
[lkml]   [2009]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -V2] acpi: don't cond_resched if irq is disabled
    Date
    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 <Larry.Finger@lwfinger.net>
    Reported-and-bisected-by: Justin P. Mattock <justinmattock@gmail.com>
    Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Bob Moore <robert.moore@intel.com>
    Cc: Lin Ming <ming.m.lin@intel.com>
    Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
    Cc: Pavel Machek <pavel@ucw.cz>
    ---
    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 <linux/hardirq.h>
    #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


    \
     
     \ /
      Last update: 2009-12-10 12:59    [W:0.020 / U:31.020 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site