diff options
| author | Patrick McHardy <kaber@trash.net> | 2004-07-22 03:13:11 -0700 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2004-07-22 03:13:11 -0700 |
| commit | 9f56f64ccd3a71e381a927872833232a2f0945df (patch) | |
| tree | ec5d805c1ded55c9d0a2d1d16bc75d63b69dd771 /net | |
| parent | 02bc27cb2a867d11d8551389df0481d7d2ec83f7 (diff) | |
| download | history-9f56f64ccd3a71e381a927872833232a2f0945df.tar.gz | |
[PKT_SCHED]: Remove dead timer code.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_api.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 575ca5016a4a4e..c876d586b5ad42 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1103,16 +1103,14 @@ int psched_tod_diff(int delta_sec, int bound) EXPORT_SYMBOL(psched_tod_diff); #endif -psched_time_t psched_time_base; - #if PSCHED_CLOCK_SOURCE == PSCHED_CPU psched_tdiff_t psched_clock_per_hz; int psched_clock_scale; EXPORT_SYMBOL(psched_clock_per_hz); EXPORT_SYMBOL(psched_clock_scale); -#endif #ifdef PSCHED_WATCHER +psched_time_t psched_time_base; PSCHED_WATCHER psched_time_mark; EXPORT_SYMBOL(psched_time_mark); EXPORT_SYMBOL(psched_time_base); @@ -1123,22 +1121,14 @@ static struct timer_list psched_timer = TIMER_INITIALIZER(psched_tick, 0, 0); static void psched_tick(unsigned long dummy) { -#if PSCHED_CLOCK_SOURCE == PSCHED_CPU psched_time_t dummy_stamp; PSCHED_GET_TIME(dummy_stamp); /* It is OK up to 4GHz cpu */ psched_timer.expires = jiffies + 1*HZ; -#else - unsigned long now = jiffies; - psched_time_base += ((u64)(now-psched_time_mark))<<PSCHED_JSCALE; - psched_time_mark = now; - psched_timer.expires = now + 60*60*HZ; -#endif add_timer(&psched_timer); } #endif -#if PSCHED_CLOCK_SOURCE == PSCHED_CPU int __init psched_calibrate_clock(void) { psched_time_t stamp, stamp1; @@ -1185,9 +1175,6 @@ static int __init pktsched_init(void) #elif PSCHED_CLOCK_SOURCE == PSCHED_JIFFIES psched_tick_per_us = HZ<<PSCHED_JSCALE; psched_us_per_tick = 1000000; -#ifdef PSCHED_WATCHER - psched_tick(0); -#endif #endif link_p = rtnetlink_links[PF_UNSPEC]; |