Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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: Kyle McMartin <kyle@parisc-linux.org>

+7 -5
+4
arch/parisc/kernel/smp.c
··· 567 567 568 568 void smp_cpus_done(unsigned int cpu_max) 569 569 { 570 + extern int update_cr16_clocksource(void); 571 + 572 + update_cr16_clocksource(); 573 + 570 574 return; 571 575 } 572 576
+3 -5
arch/parisc/kernel/time.c
··· 176 176 return get_cycles(); 177 177 } 178 178 179 - static int cr16_update_callback(void); 180 - 181 179 static struct clocksource clocksource_cr16 = { 182 180 .name = "cr16", 183 181 .rating = 300, ··· 183 185 .mask = CLOCKSOURCE_MASK(BITS_PER_LONG), 184 186 .mult = 0, /* to be set */ 185 187 .shift = 22, 186 - .update_callback = cr16_update_callback, 187 188 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 188 189 }; 189 190 190 - static int cr16_update_callback(void) 191 + #ifdef CONFIG_SMP 192 + int update_cr16_clocksource(void) 191 193 { 192 194 int change = 0; 193 195 ··· 200 202 201 203 return change; 202 204 } 203 - 205 + #endif /*CONFIG_SMP*/ 204 206 205 207 void __init start_cpu_itimer(void) 206 208 {