git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 2.6.10-1.12-FC2
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
timers
/
timer.c
diff --git
a/arch/i386/kernel/timers/timer.c
b/arch/i386/kernel/timers/timer.c
index
0526fc1
..
a3d6a28
100644
(file)
--- a/
arch/i386/kernel/timers/timer.c
+++ b/
arch/i386/kernel/timers/timer.c
@@
-12,18
+12,18
@@
*/
#endif
/* list of timers, ordered by preference, NULL terminated */
*/
#endif
/* list of timers, ordered by preference, NULL terminated */
-static struct
timer_opts*
timers[] = {
+static struct
init_timer_opts* __initdata
timers[] = {
#ifdef CONFIG_X86_CYCLONE_TIMER
#ifdef CONFIG_X86_CYCLONE_TIMER
- &timer_cyclone,
+ &timer_cyclone
_init
,
#endif
#ifdef CONFIG_HPET_TIMER
#endif
#ifdef CONFIG_HPET_TIMER
- &timer_hpet,
+ &timer_hpet
_init
,
#endif
#ifdef CONFIG_X86_PM_TIMER
#endif
#ifdef CONFIG_X86_PM_TIMER
- &timer_pmtmr,
+ &timer_pmtmr
_init
,
#endif
#endif
- &timer_tsc,
- &timer_pit,
+ &timer_tsc
_init
,
+ &timer_pit
_init
,
NULL,
};
NULL,
};
@@
-49,7
+49,7
@@
void clock_fallback(void)
/* iterates through the list of timers, returning the first
* one that initializes successfully.
*/
/* iterates through the list of timers, returning the first
* one that initializes successfully.
*/
-struct timer_opts* select_timer(void)
+struct timer_opts*
__init
select_timer(void)
{
int i = 0;
{
int i = 0;
@@
-57,7
+57,7
@@
struct timer_opts* select_timer(void)
while (timers[i]) {
if (timers[i]->init)
if (timers[i]->init(clock_override) == 0)
while (timers[i]) {
if (timers[i]->init)
if (timers[i]->init(clock_override) == 0)
- return timers[i];
+ return timers[i]
->opts
;
++i;
}
++i;
}