Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / arch / alpha / kernel / time.c

diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index cf066652398952d0e9d14746e0865c5f42239c1e..1dd50d07693cb9241ce1d064b589d5d4938c64ff 100644 (file)
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -57,6 +57,7 @@
 static int set_rtc_mmss(unsigned long);
 
 DEFINE_SPINLOCK(rtc_lock);
+EXPORT_SYMBOL(rtc_lock);
 
 #define TICK_SIZE (tick_nsec / 1000)
 
@@ -89,17 +90,6 @@ static inline __u32 rpcc(void)
     return result;
 }
 
-/*
- * Scheduler clock - returns current time in nanosec units.
- *
- * Copied from ARM code for expediency... ;-}
- */
-unsigned long long sched_clock(void)
-{
-        return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
-
 /*
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
@@ -154,7 +144,7 @@ irqreturn_t timer_interrupt(int irq, void *dev)
        return IRQ_HANDLED;
 }
 
-void
+void __init
 common_init_rtc(void)
 {
        unsigned char x;