diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-21 07:37:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:49:15 -0400 |
commit | 18de5bc4c1f1f1fa5e14f354a7603bd6e9d4e3b6 (patch) | |
tree | cb0ff399fb3f368adecf213318e32a499ada6ff9 /arch/i386/kernel/apic.c | |
parent | 93da56efcf8c6a111f0349f6b7651172d4745ca0 (diff) |
clockevents: fix resume logic
We need to make sure, that the clockevent devices are resumed, before
the tick is resumed. The current resume logic does not guarantee this.
Add CLOCK_EVT_MODE_RESUME and call the set mode functions of the clock
event devices before resuming the tick / oneshot functionality.
Fixup the existing users.
Thanks to Nigel Cunningham for tracking down a long standing thinko,
which affected the jinxed VAIO.
[akpm@linux-foundation.org: xen build fix]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/apic.c')
-rw-r--r-- | arch/i386/kernel/apic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 67824f3bb97..610f44b2436 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c | |||
@@ -263,6 +263,9 @@ static void lapic_timer_setup(enum clock_event_mode mode, | |||
263 | v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); | 263 | v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); |
264 | apic_write_around(APIC_LVTT, v); | 264 | apic_write_around(APIC_LVTT, v); |
265 | break; | 265 | break; |
266 | case CLOCK_EVT_MODE_RESUME: | ||
267 | /* Nothing to do here */ | ||
268 | break; | ||
266 | } | 269 | } |
267 | 270 | ||
268 | local_irq_restore(flags); | 271 | local_irq_restore(flags); |