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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
timers
/
timer_pit.c
diff --git
a/arch/i386/kernel/timers/timer_pit.c
b/arch/i386/kernel/timers/timer_pit.c
index
a433cb0
..
967d545
100644
(file)
--- a/
arch/i386/kernel/timers/timer_pit.c
+++ b/
arch/i386/kernel/timers/timer_pit.c
@@
-152,14
+152,18
@@
static unsigned long get_offset_pit(void)
/* tsc timer_opts struct */
struct timer_opts timer_pit = {
/* tsc timer_opts struct */
struct timer_opts timer_pit = {
- .name = "pit",
- .init = init_pit,
- .mark_offset = mark_offset_pit,
- .get_offset = get_offset_pit,
+ .name = "pit",
+ .mark_offset = mark_offset_pit,
+ .get_offset = get_offset_pit,
.monotonic_clock = monotonic_clock_pit,
.delay = delay_pit,
};
.monotonic_clock = monotonic_clock_pit,
.delay = delay_pit,
};
+struct init_timer_opts __initdata timer_pit_init = {
+ .init = init_pit,
+ .opts = &timer_pit,
+};
+
void setup_pit_timer(void)
{
extern spinlock_t i8253_lock;
void setup_pit_timer(void)
{
extern spinlock_t i8253_lock;
@@
-181,7
+185,7
@@
static int timer_resume(struct sys_device *dev)
}
static struct sysdev_class timer_sysclass = {
}
static struct sysdev_class timer_sysclass = {
- set_kset_name("timer"),
+ set_kset_name("timer
_pit
"),
.resume = timer_resume,
};
.resume = timer_resume,
};