diff options
| author | john stultz <johnstul@us.ibm.com> | 2007-05-07 01:50:34 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 23:12:58 +0400 |
| commit | aeecf3142d82414d511135cc85f86caddfb58338 (patch) | |
| tree | 46b10252750729120ec15f03aaad773f7da80258 /arch/h8300 | |
| parent | a5f6abd4f7558fea97bc4021fd0eb7dcc5d16a77 (diff) | |
| download | linux-aeecf3142d82414d511135cc85f86caddfb58338.tar.xz | |
Convert h8/300 to generic timekeeping
Currently h8/300 does not implement sub-jiffy timekeeping, so there is no
benefit to having arch specific timekeeping code.
This patch simply removes those functions and enables the generic
timekeeping code.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Acked-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/Kconfig | 4 | ||||
| -rw-r--r-- | arch/h8300/kernel/time.c | 52 |
2 files changed, 4 insertions, 52 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 1734d96422c6..86f6ca36363f 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -53,6 +53,10 @@ config GENERIC_CALIBRATE_DELAY bool default y +config GENERIC_TIME + bool + default y + config TIME_LOW_RES bool default y diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c index d1ef615ba895..91d3b56ddc68 100644 --- a/arch/h8300/kernel/time.c +++ b/arch/h8300/kernel/time.c @@ -66,55 +66,3 @@ void time_init(void) platform_timer_setup(timer_interrupt); } - -/* - * This version of gettimeofday has near microsecond resolution. - */ -void do_gettimeofday(struct timeval *tv) -{ - unsigned long flags; - unsigned long usec, sec; - - read_lock_irqsave(&xtime_lock, flags); - usec = 0; - sec = xtime.tv_sec; - usec += (xtime.tv_nsec / 1000); - read_unlock_irqrestore(&xtime_lock, flags); - - while (usec >= 1000000) { - usec -= 1000000; - sec++; - } - - tv->tv_sec = sec; - tv->tv_usec = usec; -} - -EXPORT_SYMBOL(do_gettimeofday); - -int do_settimeofday(struct timespec *tv) -{ - if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) - return -EINVAL; - - write_lock_irq(&xtime_lock); - /* This is revolting. We need to set the xtime.tv_usec - * correctly. However, the value in this location is - * is value at the last tick. - * Discover what correction gettimeofday - * would have done, and then undo it! - */ - while (tv->tv_nsec < 0) { - tv->tv_nsec += NSEC_PER_SEC; - tv->tv_sec--; - } - - xtime.tv_sec = tv->tv_sec; - xtime.tv_nsec = tv->tv_nsec; - ntp_clear(); - write_sequnlock_irq(&xtime_lock); - clock_was_set(); - return 0; -} - -EXPORT_SYMBOL(do_settimeofday); |