lkml.org 
[lkml]   [2014]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 014/160] tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()
    Date
    3.13.11.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Viresh Kumar <viresh.kumar@linaro.org>

    commit 27630532ef5ead28b98cfe28d8f95222ef91c2b7 upstream.

    Since commit d689fe222 (NOHZ: Check for nohz active instead of nohz
    enabled) the tick_nohz_switch_to_nohz() function returns because it
    checks for the tick_nohz_active flag. This can't be set, because the
    function itself sets it.

    Undo the change in tick_nohz_switch_to_nohz().

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    Cc: linaro-kernel@lists.linaro.org
    Cc: fweisbec@gmail.com
    Cc: Arvind.Chauhan@arm.com
    Cc: linaro-networking@linaro.org
    Link: http://lkml.kernel.org/r/40939c05f2d65d781b92b20302b02243d0654224.1397537987.git.viresh.kumar@linaro.org
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    kernel/time/tick-sched.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
    index ea20f7d..29b063b 100644
    --- a/kernel/time/tick-sched.c
    +++ b/kernel/time/tick-sched.c
    @@ -970,7 +970,7 @@ static void tick_nohz_switch_to_nohz(void)
    struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);
    ktime_t next;

    - if (!tick_nohz_active)
    + if (!tick_nohz_enabled)
    return;

    local_irq_disable();
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-06-10 23:21    [W:4.258 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site