diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 11:34:55 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 09:36:34 -0700 |
| commit | c8d5ba1891eda2aa63800f052cb5af128283d130 (patch) | |
| tree | 59a18c2262607b4067739fe4dfed3c6fa8e40f14 /arch/m68k/kernel/time.c | |
| parent | 7b1f62076bba10786d2118006ae68ac120cd6c56 (diff) | |
m68k: set arch_gettimeoffset directly
remove m68k's mach_gettimeoffset function pointer, and instead directly
set the arch_gettimeoffset function pointer. This requires multiplying
all function results by 1000, since the removed m68k_gettimeoffset() did
this. Also, s/unsigned long/u32/ just to make the function prototypes
exactly match that of arch_gettimeoffset.
Cc: Joshua Thompson <funaho@jurai.org>
Cc: Sam Creasey <sammy@sammy.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/m68k/kernel/time.c')
| -rw-r--r-- | arch/m68k/kernel/time.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index c2994c8c30d..bea6bcf8f9b 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -82,11 +82,6 @@ void read_persistent_clock(struct timespec *ts) #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET -static u32 m68k_gettimeoffset(void) -{ - return mach_gettimeoffset() * 1000; -} - static int __init rtc_init(void) { struct platform_device *pdev; @@ -104,9 +99,5 @@ module_init(rtc_init); void __init time_init(void) { -#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET - arch_gettimeoffset = m68k_gettimeoffset; -#endif - mach_sched_init(timer_interrupt); } |