diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 19:33:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 19:33:26 -0700 |
| commit | f5325225658737e6c9cb8e24373e2c281a90be2a (patch) | |
| tree | f1daf00b394b543876b6ffbfd67c050c3bb1b114 /include | |
| parent | 4747832b56a95dbeb0cef4714e6fcc766eed0a95 (diff) | |
| parent | 4ab6a219113197425ac112e35e1ec8062c69888e (diff) | |
| download | linux-f5325225658737e6c9cb8e24373e2c281a90be2a.tar.gz linux-f5325225658737e6c9cb8e24373e2c281a90be2a.tar.bz2 linux-f5325225658737e6c9cb8e24373e2c281a90be2a.zip | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource, acpi_pm.c: check for monotonicity
clocksource, acpi_pm.c: use proper read function also in errata mode
ntp: fix calculation of the next jiffie to trigger RTC sync
x86: HPET: read back compare register before reading counter
x86: HPET fix moronic 32/64bit thinko
clockevents: broadcast fixup possible waiters
HPET: make minimum reprogramming delta useful
clockevents: prevent endless loop lockup
clockevents: prevent multiple init/shutdown
clockevents: enforce reprogram in oneshot setup
clockevents: prevent endless loop in periodic broadcast handler
clockevents: prevent clockevent event_handler ending up handler_noop
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clockchips.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index c33b0dc28e4d..ed3a5d473e52 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -127,6 +127,8 @@ extern int clockevents_register_notifier(struct notifier_block *nb); extern int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, ktime_t now); +extern void clockevents_handle_noop(struct clock_event_device *dev); + #ifdef CONFIG_GENERIC_CLOCKEVENTS extern void clockevents_notify(unsigned long reason, void *arg); #else |