Commit b2a8289a authored by Kyle McMartin's avatar Kyle McMartin

[PARISC] time: clocksource lost update_callback

So move the code to be called by smp_cpus_done, which is
after we've figured out if there's more than one cpu
actually present.
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 87c81747
...@@ -567,6 +567,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus) ...@@ -567,6 +567,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
void smp_cpus_done(unsigned int cpu_max) void smp_cpus_done(unsigned int cpu_max)
{ {
extern int update_cr16_clocksource(void);
update_cr16_clocksource();
return; return;
} }
......
...@@ -176,8 +176,6 @@ static cycle_t read_cr16(void) ...@@ -176,8 +176,6 @@ static cycle_t read_cr16(void)
return get_cycles(); return get_cycles();
} }
static int cr16_update_callback(void);
static struct clocksource clocksource_cr16 = { static struct clocksource clocksource_cr16 = {
.name = "cr16", .name = "cr16",
.rating = 300, .rating = 300,
...@@ -185,11 +183,11 @@ static struct clocksource clocksource_cr16 = { ...@@ -185,11 +183,11 @@ static struct clocksource clocksource_cr16 = {
.mask = CLOCKSOURCE_MASK(BITS_PER_LONG), .mask = CLOCKSOURCE_MASK(BITS_PER_LONG),
.mult = 0, /* to be set */ .mult = 0, /* to be set */
.shift = 22, .shift = 22,
.update_callback = cr16_update_callback,
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
static int cr16_update_callback(void) #ifdef CONFIG_SMP
int update_cr16_clocksource(void)
{ {
int change = 0; int change = 0;
...@@ -202,7 +200,7 @@ static int cr16_update_callback(void) ...@@ -202,7 +200,7 @@ static int cr16_update_callback(void)
return change; return change;
} }
#endif /*CONFIG_SMP*/
void __init start_cpu_itimer(void) void __init start_cpu_itimer(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment