diff options
author | Alexey Dobriyan <adobriyan@openvz.org> | 2007-02-10 04:45:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:28 -0500 |
commit | b035b6de24932ffd4a2b1c6619a2f5711da6920f (patch) | |
tree | 76f43316bf4788c510a1f271064b67ef8e584035 /arch/xtensa/kernel | |
parent | 5e07e1ccb0c0f25dd748ebe2ef83008c2229bf1c (diff) |
[PATCH] Consolidate default sched_clock()
Use attribute(weak).
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r-- | arch/xtensa/kernel/time.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index a350431363a0..22949be4a5d8 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -38,15 +38,6 @@ unsigned long ccount_nsec; /* nsec per ccount increment */ | |||
38 | unsigned int last_ccount_stamp; | 38 | unsigned int last_ccount_stamp; |
39 | static long last_rtc_update = 0; | 39 | static long last_rtc_update = 0; |
40 | 40 | ||
41 | /* | ||
42 | * Scheduler clock - returns current tim in nanosec units. | ||
43 | */ | ||
44 | |||
45 | unsigned long long sched_clock(void) | ||
46 | { | ||
47 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
48 | } | ||
49 | |||
50 | static irqreturn_t timer_interrupt(int irq, void *dev_id); | 41 | static irqreturn_t timer_interrupt(int irq, void *dev_id); |
51 | static struct irqaction timer_irqaction = { | 42 | static struct irqaction timer_irqaction = { |
52 | .handler = timer_interrupt, | 43 | .handler = timer_interrupt, |