diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /kernel/time/tick-common.c | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
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 80c4336f4188..c4777193d567 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c | |||
| @@ -161,6 +161,7 @@ static void tick_setup_device(struct tick_device *td, | |||
| 161 | } else { | 161 | } else { |
| 162 | handler = td->evtdev->event_handler; | 162 | handler = td->evtdev->event_handler; |
| 163 | next_event = td->evtdev->next_event; | 163 | next_event = td->evtdev->next_event; |
| 164 | td->evtdev->event_handler = clockevents_handle_noop; | ||
| 164 | } | 165 | } |
| 165 | 166 | ||
| 166 | td->evtdev = newdev; | 167 | td->evtdev = newdev; |