diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 14:25:05 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 14:25:05 +0400 |
| commit | 373e42a25dcc53782c1b1eca086dadf8b5adb546 (patch) | |
| tree | 8b9e56b9426a35486a5a5d6169edf0442b67b733 /kernel/time/tick-common.c | |
| parent | 30eb987e02b3481e8b9c41d564eed49928f91478 (diff) | |
| parent | 0bfd8ffeff9dda08c69381d65c72e0aa58706ef6 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-linux-linaro-lsk
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index b1600a6973f..7076b3f53e8 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -323,6 +323,7 @@ static void tick_shutdown(unsigned int *cpup) */ dev->mode = CLOCK_EVT_MODE_UNUSED; clockevents_exchange_device(dev, NULL); + dev->event_handler = clockevents_handle_noop; td->evtdev = NULL; } raw_spin_unlock_irqrestore(&tick_device_lock, flags); |