lkml.org 
[lkml]   [2009]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] sched: Cover the CONFIG_DEBUG_SPINLOCK_SLEEP off-case for __might_sleep()
    Date
    Cover the off case for __might_sleep(), so that we avoid #ifdefs
    in files that make use of it. Especially, this prepares for the
    __might_sleep() pull up on cond_resched().

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Peter Zijlstra a.p.zijlstra@chello.nl
    ---
    include/linux/kernel.h | 1 +
    kernel/sched.c | 3 +--
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/include/linux/kernel.h b/include/linux/kernel.h
    index b0ff486..99882e8 100644
    --- a/include/linux/kernel.h
    +++ b/include/linux/kernel.h
    @@ -231,6 +231,7 @@ extern int _cond_resched(void);
    # define might_sleep() \
    do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0)
    #else
    + static inline void __might_sleep(char *file, int line) { }
    # define might_sleep() do { might_resched(); } while (0)
    #endif

    diff --git a/kernel/sched.c b/kernel/sched.c
    index bb11547..ac334ba 100644
    --- a/kernel/sched.c
    +++ b/kernel/sched.c
    @@ -6610,9 +6610,8 @@ static inline int should_resched(void)

    static void __cond_resched(void)
    {
    -#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
    __might_sleep(__FILE__, __LINE__);
    -#endif
    +
    add_preempt_count(PREEMPT_ACTIVE);
    schedule();
    sub_preempt_count(PREEMPT_ACTIVE);
    --
    1.6.2.3


    \
     
     \ /
      Last update: 2009-07-16 08:31    [W:0.021 / U:0.992 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site