diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 00:37:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 00:37:55 -0700 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /kernel/time/tick-sched.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index fa9bb73dbdb4..686da821d376 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -282,6 +282,7 @@ void tick_nohz_stop_sched_tick(void) ts->idle_tick = ts->sched_timer.expires; ts->tick_stopped = 1; ts->idle_jiffies = last_jiffies; + rcu_enter_nohz(); } /* @@ -375,6 +376,8 @@ void tick_nohz_restart_sched_tick(void) return; } + rcu_exit_nohz(); + /* Update jiffies first */ select_nohz_load_balancer(0); now = ktime_get(); @@ -637,7 +640,7 @@ void tick_cancel_sched_timer(int cpu) if (ts->sched_timer.base) hrtimer_cancel(&ts->sched_timer); - ts->tick_stopped = 0; + ts->nohz_mode = NOHZ_MODE_INACTIVE; } #endif /* HIGH_RES_TIMERS */ |