diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2008-05-01 04:34:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 08:03:59 -0700 |
| commit | 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168 (patch) | |
| tree | 63264208ed97f18a74a5a7cd2e100cc2c4e13449 /include/linux | |
| parent | 8383c42399f394a89bd6c2f03632c53689bdde7a (diff) | |
| download | blackbird-op-linux-7dffa3c673fbcf835cd7be80bb4aec8ad3f51168.tar.gz blackbird-op-linux-7dffa3c673fbcf835cd7be80bb4aec8ad3f51168.zip | |
ntp: handle leap second via timer
Remove the leap second handling from second_overflow(), which doesn't have to
check for it every second anymore. With CONFIG_NO_HZ this also makes sure the
leap second is handled close to the full second. Additionally this makes it
possible to abort a leap second properly by resetting the STA_INS/STA_DEL
status bits.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clocksource.h | 2 | ||||
| -rw-r--r-- | include/linux/timex.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 35094479ca55..55e434feec99 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -93,6 +93,8 @@ struct clocksource { #endif }; +extern struct clocksource *clock; /* current clocksource */ + /* * Clock source flags bits:: */ diff --git a/include/linux/timex.h b/include/linux/timex.h index da431f8c5c6e..fc6035d29d56 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -212,6 +212,7 @@ extern long time_esterror; /* estimated error */ extern long time_adjust; /* The amount of adjtime left */ +extern void ntp_init(void); extern void ntp_clear(void); /** |
