*/
#endif
/* list of timers, ordered by preference, NULL terminated */
-static struct init_timer_opts* __initdata timers[] = {
+static struct timer_opts* timers[] = {
#ifdef CONFIG_X86_CYCLONE_TIMER
- &timer_cyclone_init,
+ &timer_cyclone,
#endif
#ifdef CONFIG_HPET_TIMER
- &timer_hpet_init,
+ &timer_hpet,
#endif
+ &timer_tsc,
#ifdef CONFIG_X86_PM_TIMER
- &timer_pmtmr_init,
+ &timer_pmtmr,
#endif
- &timer_tsc_init,
- &timer_pit_init,
+ &timer_pit,
NULL,
};
/* iterates through the list of timers, returning the first
* one that initializes successfully.
*/
-struct timer_opts* __init select_timer(void)
+struct timer_opts* select_timer(void)
{
int i = 0;
while (timers[i]) {
if (timers[i]->init)
if (timers[i]->init(clock_override) == 0)
- return timers[i]->opts;
+ return timers[i];
++i;
}