diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-01-20 08:47:21 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-01-21 12:01:42 -0600 |
| commit | e6edc714b996dc5d32a4e24c78d54bf9afbb3bca (patch) | |
| tree | ff330d291c30791c5ea17ab22616385068b05304 | |
| parent | 2f64784c22b73fd369011a4da1ceb54edc4ba801 (diff) | |
Revert "tick: SHUTDOWN event-dev if no events are required for KTIME_MAX"linux-lng-3.14.26-2015.02linux-lng-3.14.26-2015.01
This reverts commit c817b87cb66410545e0b45f05a015d3b6bc2cec3.
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); } /** |