summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2009-03-04 21:39:12 +0100
committerChris Zankel <chris@zankel.net>2009-04-02 23:44:51 -0700
commit90be8c16950e28aee7cad422272805dcefa06167 (patch)
treef3ae73792d5aaf66bc71a5daea4360c57f9e8639 /arch/xtensa
parentf82e939fb75ad01da8f0d3024fc678111ddb4ac7 (diff)
downloadlinux-stable-90be8c16950e28aee7cad422272805dcefa06167.tar.gz
linux-stable-90be8c16950e28aee7cad422272805dcefa06167.tar.bz2
linux-stable-90be8c16950e28aee7cad422272805dcefa06167.zip
xtensa: use generic sched_clock()
Current xtensa implementation of sched_clock() is the same as the generic one. Just remove it, the weak symbol in kernel/sched_clock.c will be used instead. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/time.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 8df1e842f6d4..86bfe83718e9 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -37,15 +37,6 @@ unsigned long nsec_per_ccount; /* nsec per ccount increment */
static long last_rtc_update = 0;
-/*
- * Scheduler clock - returns current tim in nanosec units.
- */
-
-unsigned long long sched_clock(void)
-{
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
static irqreturn_t timer_interrupt(int irq, void *dev_id);
static struct irqaction timer_irqaction = {
.handler = timer_interrupt,