[Xen-changelog] [linux-2.6.18-xen] x86/time: remove dead code

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1381928848 -7200
# Node ID 3ae180dda3a99b5208e13083a3767c041632363b
# Parent  80784d88c2e7c6798f87a36a815a94b076719c32
x86/time: remove dead code

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 80784d88c2e7 -r 3ae180dda3a9 arch/i386/kernel/time-xen.c
--- a/arch/i386/kernel/time-xen.c       Wed Oct 16 15:05:18 2013 +0200
+++ b/arch/i386/kernel/time-xen.c       Wed Oct 16 15:07:28 2013 +0200
@@ -45,7 +45,6 @@
 #include <linux/sysdev.h>
 #include <linux/bcd.h>
 #include <linux/efi.h>
-#include <linux/mca.h>
 #include <linux/sysctl.h>
 #include <linux/percpu.h>
 #include <linux/kernel_stat.h>
@@ -97,10 +96,6 @@ extern unsigned long wall_jiffies;
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
 
-extern struct init_timer_opts timer_tsc_init;
-extern struct timer_opts timer_tsc;
-#define timer_none timer_tsc
-
 /* These are peridically updated in shared_info, and then copied here. */
 struct shadow_time_info {
        u64 tsc_timestamp;     /* TSC at last update of time vals.  */
@@ -172,24 +167,6 @@ static int __init __permitted_clock_jitt
 }
 __setup("permitted_clock_jitter=", __permitted_clock_jitter);
 
-#if 0
-static void delay_tsc(unsigned long loops)
-{
-       unsigned long bclock, now;
-
-       rdtscl(bclock);
-       do {
-               rep_nop();
-               rdtscl(now);
-       } while ((now - bclock) < loops);
-}
-
-struct timer_opts timer_tsc = {
-       .name = "tsc",
-       .delay = delay_tsc,
-};
-#endif
-
 /*
  * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
  * yielding a 64-bit result.
@@ -226,14 +203,6 @@ static inline u64 scale_delta(u64 delta,
        return product;
 }
 
-#if 0 /* defined (__i386__) */
-int read_current_timer(unsigned long *timer_val)
-{
-       rdtscl(*timer_val);
-       return 0;
-}
-#endif
-
 void init_cpu_khz(void)
 {
        u64 __cpu_khz = 1000000ULL << 32;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog