From: Johannes Weiner Date: Wed, 4 Mar 2009 20:39:12 +0000 (+0100) Subject: xtensa: use generic sched_clock() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90be8c16950e28aee7cad422272805dcefa06167;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Chris Zankel --- 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,