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>
This commit is contained in:
@@ -40,7 +40,7 @@ extern void q40_init_IRQ(void);
|
||||
static void q40_get_model(char *model);
|
||||
extern void q40_sched_init(irq_handler_t handler);
|
||||
|
||||
static unsigned long q40_gettimeoffset(void);
|
||||
static u32 q40_gettimeoffset(void);
|
||||
static int q40_hwclk(int, struct rtc_time *);
|
||||
static unsigned int q40_get_ss(void);
|
||||
static int q40_set_clock_mmss(unsigned long);
|
||||
@@ -170,7 +170,7 @@ void __init config_q40(void)
|
||||
mach_sched_init = q40_sched_init;
|
||||
|
||||
mach_init_IRQ = q40_init_IRQ;
|
||||
mach_gettimeoffset = q40_gettimeoffset;
|
||||
arch_gettimeoffset = q40_gettimeoffset;
|
||||
mach_hwclk = q40_hwclk;
|
||||
mach_get_ss = q40_get_ss;
|
||||
mach_get_rtc_pll = q40_get_rtc_pll;
|
||||
@@ -204,9 +204,9 @@ int q40_parse_bootinfo(const struct bi_record *rec)
|
||||
}
|
||||
|
||||
|
||||
static unsigned long q40_gettimeoffset(void)
|
||||
static u32 q40_gettimeoffset(void)
|
||||
{
|
||||
return 5000 * (ql_ticks != 0);
|
||||
return 5000 * (ql_ticks != 0) * 1000;
|
||||
}
|
||||
|
||||
|
||||
|
Viittaa uudesa ongelmassa
Block a user