diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-01-20 09:08:13 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-01-21 12:05:56 -0600 |
| commit | 27cfe47ea6510645e0fc54ea5551cb07f541b520 (patch) | |
| tree | bf33e6256d260a265b32d4ccf5c23d788e6517b0 | |
| parent | dbc876606a3324b4be6af84eeed515131ce230b1 (diff) | |
Revert "tick: SHUTDOWN event-dev if no events are required for KTIME_MAX"linux-lng-preempt-rt-3.14.26-2015.02linux-lng-preempt-rt-3.14.26-2015.01
This reverts commit 30014d2efde7a01117404cc335599fbb811aef72.
Per request from the patch's author.
| -rw-r--r-- | kernel/time/tick-oneshot.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c index 5e156f17f4ec..b338d4bed35b 100644 --- a/kernel/time/tick-oneshot.c +++ b/kernel/time/tick-oneshot.c @@ -52,19 +52,8 @@ void tick_restart_event(void) int tick_program_event(ktime_t expires, int force) { struct clock_event_device *dev = __this_cpu_read(tick_cpu_device.evtdev); - int ret = 0; - - /* Shut down event device if it is not required for long */ - if (unlikely(expires.tv64 == KTIME_MAX)) { - clockevents_set_mode(dev, CLOCK_EVT_MODE_SHUTDOWN); - } else { - /* restore mode when restarting event dev */ - if (unlikely(dev->mode == CLOCK_EVT_MODE_SHUTDOWN)) - clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT); - ret = clockevents_program_event(dev, expires, force); - } - return ret; + return clockevents_program_event(dev, expires, force); } /** |