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/cris | |
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/cris')
-rw-r--r-- | arch/cris/kernel/time.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 22a1aa511aea..acfd04559405 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
@@ -216,14 +216,6 @@ cris_do_profile(struct pt_regs* regs) | |||
216 | #endif | 216 | #endif |
217 | } | 217 | } |
218 | 218 | ||
219 | /* | ||
220 | * Scheduler clock - returns current time in nanosec units. | ||
221 | */ | ||
222 | unsigned long long sched_clock(void) | ||
223 | { | ||
224 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
225 | } | ||
226 | |||
227 | static int | 219 | static int |
228 | __init init_udelay(void) | 220 | __init init_udelay(void) |
229 | { | 221 | { |