Commit 047ab431 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] timers: input, networking

More timer micropatches.
parent 6a65c34a
...@@ -844,6 +844,7 @@ int __init i8042_init(void) ...@@ -844,6 +844,7 @@ int __init i8042_init(void)
i8042_port_register(&i8042_kbd_values, &i8042_kbd_port); i8042_port_register(&i8042_kbd_values, &i8042_kbd_port);
init_timer(&i8042_timer);
i8042_timer.function = i8042_timer_func; i8042_timer.function = i8042_timer_func;
mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD); mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
......
...@@ -98,7 +98,7 @@ spinlock_t inet_peer_unused_lock = SPIN_LOCK_UNLOCKED; ...@@ -98,7 +98,7 @@ spinlock_t inet_peer_unused_lock = SPIN_LOCK_UNLOCKED;
static void peer_check_expire(unsigned long dummy); static void peer_check_expire(unsigned long dummy);
static struct timer_list peer_periodic_timer = static struct timer_list peer_periodic_timer =
{ .function = &peer_check_expire }; TIMER_INITIALIZER(peer_check_expire, 0, 0);
/* Exported for sysctl_net_ipv4. */ /* Exported for sysctl_net_ipv4. */
int inet_peer_gc_mintime = 10 * HZ, int inet_peer_gc_mintime = 10 * HZ,
......
...@@ -2526,7 +2526,9 @@ void __init ip_rt_init(void) ...@@ -2526,7 +2526,9 @@ void __init ip_rt_init(void)
devinet_init(); devinet_init();
ip_fib_init(); ip_fib_init();
init_timer(&rt_flush_timer);
rt_flush_timer.function = rt_run_flush; rt_flush_timer.function = rt_run_flush;
init_timer(&rt_periodic_timer);
rt_periodic_timer.function = rt_check_expire; rt_periodic_timer.function = rt_check_expire;
/* All the timers, started at system startup tend /* All the timers, started at system startup tend
......
...@@ -428,7 +428,7 @@ static void tcp_twkill(unsigned long); ...@@ -428,7 +428,7 @@ static void tcp_twkill(unsigned long);
static struct tcp_tw_bucket *tcp_tw_death_row[TCP_TWKILL_SLOTS]; static struct tcp_tw_bucket *tcp_tw_death_row[TCP_TWKILL_SLOTS];
static spinlock_t tw_death_lock = SPIN_LOCK_UNLOCKED; static spinlock_t tw_death_lock = SPIN_LOCK_UNLOCKED;
static struct timer_list tcp_tw_timer = { .function = tcp_twkill }; static struct timer_list tcp_tw_timer = TIMER_INITIALIZER(tcp_twkill, 0, 0);
static void SMP_TIMER_NAME(tcp_twkill)(unsigned long dummy) static void SMP_TIMER_NAME(tcp_twkill)(unsigned long dummy)
{ {
...@@ -495,7 +495,8 @@ void tcp_tw_deschedule(struct tcp_tw_bucket *tw) ...@@ -495,7 +495,8 @@ void tcp_tw_deschedule(struct tcp_tw_bucket *tw)
static int tcp_twcal_hand = -1; static int tcp_twcal_hand = -1;
static int tcp_twcal_jiffie; static int tcp_twcal_jiffie;
static void tcp_twcal_tick(unsigned long); static void tcp_twcal_tick(unsigned long);
static struct timer_list tcp_twcal_timer = {.function = tcp_twcal_tick}; static struct timer_list tcp_twcal_timer =
TIMER_INITIALIZER(tcp_twcal_tick, 0, 0);
static struct tcp_tw_bucket *tcp_twcal_row[TCP_TW_RECYCLE_SLOTS]; static struct tcp_tw_bucket *tcp_twcal_row[TCP_TW_RECYCLE_SLOTS];
void tcp_tw_schedule(struct tcp_tw_bucket *tw, int timeo) void tcp_tw_schedule(struct tcp_tw_bucket *tw, int timeo)
......
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