From 2bab04737901634518277220db1ee5a1b1638275 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Mon, 15 Oct 2012 16:17:16 +0200 Subject: [PATCH] --- yaml --- r: 339104 b: refs/heads/master c: 94a571402012e0dfaa23bbbdd64d033f48477d86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/time/tick-sched.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0ab22f4ffd9b..782e4e248d4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e8f559b08cbc1cfcbf093840a2a760a946cb90f +refs/heads/master: 94a571402012e0dfaa23bbbdd64d033f48477d86 diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index 68a873af09a8..766d4c47a4a4 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/kernel/time/tick-sched.c @@ -122,6 +122,7 @@ static void tick_sched_do_timer(ktime_t now) static void tick_sched_handle(struct tick_sched *ts, struct pt_regs *regs) { +#ifdef CONFIG_NO_HZ /* * When we are idle and the tick is stopped, we have to touch * the watchdog as we might not schedule for a really long @@ -135,6 +136,7 @@ static void tick_sched_handle(struct tick_sched *ts, struct pt_regs *regs) if (is_idle_task(current)) ts->idle_jiffies++; } +#endif update_process_times(user_mode(regs)); profile_tick(CPU_PROFILING); }