diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:19:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:19:26 +0200 |
| commit | 9b9b181ce53ef387dfe3df9316bbc641fca13d51 (patch) | |
| tree | acc34cf3d5172536c37de61eafbda399163e4265 /kernel/time/tick-common.c | |
| parent | fb71e45338453698bd7460f7e8f171ea0304d218 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | kernel-crypto-9b9b181ce53ef387dfe3df9316bbc641fca13d51.tar.gz kernel-crypto-9b9b181ce53ef387dfe3df9316bbc641fca13d51.tar.xz kernel-crypto-9b9b181ce53ef387dfe3df9316bbc641fca13d51.zip | |
Merge commit 'v2.6.27-rc7' into core/locking
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index c4777193d56..019315ebf9d 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -249,7 +249,7 @@ static int tick_check_new_device(struct clock_event_device *newdev) * not give it back to the clockevents layer ! */ if (tick_is_broadcast_device(curdev)) { - clockevents_set_mode(curdev, CLOCK_EVT_MODE_SHUTDOWN); + clockevents_shutdown(curdev); curdev = NULL; } clockevents_exchange_device(curdev, newdev); @@ -311,7 +311,7 @@ static void tick_suspend(void) unsigned long flags; spin_lock_irqsave(&tick_device_lock, flags); - clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_SHUTDOWN); + clockevents_shutdown(td->evtdev); spin_unlock_irqrestore(&tick_device_lock, flags); } |