diff --git a/[refs] b/[refs] index 20ef8a86b509..1a741e4e3560 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b610fda0df5d0f0b0c64242e37441ad1b384aac +refs/heads/master: e338125b8a886923ba8367207c144764dc352584 diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c index 85defd01d293..9839767d0842 100644 --- a/trunk/arch/s390/kernel/process.c +++ b/trunk/arch/s390/kernel/process.c @@ -142,7 +142,7 @@ static void default_idle(void) void cpu_idle(void) { for (;;) { - tick_nohz_stop_sched_tick(); + tick_nohz_stop_sched_tick(1); while (!need_resched()) default_idle(); tick_nohz_restart_sched_tick();