[PATCH 2.6]: Remove dead timer code from sch_api.c

[Patrick McHardy <kaber@xxxxxxxxx>]

With Stephen's recent changes to use get_jiffies_64 for PSCHED_JIFFIES
PSCHED_WATCHER is no longer defined for PSCHED_JIFFIES. This patch
removes some dead code to handle jiffies wraps from sch_api.


# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/07/14 04:17:31+02:00 kaber@xxxxxxxxx 
#   [PKT_SCHED]: Remove dead timer code
#   
#   Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
# 
# net/sched/sch_api.c
#   2004/07/14 04:17:21+02:00 kaber@xxxxxxxxx +1 -14
#   [PKT_SCHED]: Remove dead timer code
# 
# include/net/pkt_sched.h
#   2004/07/14 04:17:21+02:00 kaber@xxxxxxxxx +1 -2
#   [PKT_SCHED]: Remove dead timer code
# 
diff -Nru a/include/net/pkt_sched.h b/include/net/pkt_sched.h
--- a/include/net/pkt_sched.h   2004-07-14 04:19:55 +02:00
+++ b/include/net/pkt_sched.h   2004-07-14 04:19:55 +02:00
@@ -216,8 +216,6 @@
 typedef u64    psched_time_t;
 typedef long   psched_tdiff_t;
 
-extern psched_time_t   psched_time_base;
-
 #if PSCHED_CLOCK_SOURCE == PSCHED_JIFFIES
 
 #if HZ < 96
@@ -256,6 +254,7 @@
 
 #define PSCHED_WATCHER u32
 
+extern psched_time_t psched_time_base;
 extern PSCHED_WATCHER psched_time_mark;
 
 #define PSCHED_GET_TIME(stamp) \
diff -Nru a/net/sched/sch_api.c b/net/sched/sch_api.c
--- a/net/sched/sch_api.c       2004-07-14 04:19:55 +02:00
+++ b/net/sched/sch_api.c       2004-07-14 04:19:55 +02:00
@@ -1103,16 +1103,14 @@
 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 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 @@
 #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];