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/parisc/kernel/time.c | |
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/parisc/kernel/time.c')
-rw-r--r-- | arch/parisc/kernel/time.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index bad7d1eb62b9..5f1b51af06a9 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c | |||
@@ -288,17 +288,6 @@ do_settimeofday (struct timespec *tv) | |||
288 | } | 288 | } |
289 | EXPORT_SYMBOL(do_settimeofday); | 289 | EXPORT_SYMBOL(do_settimeofday); |
290 | 290 | ||
291 | /* | ||
292 | * XXX: We can do better than this. | ||
293 | * Returns nanoseconds | ||
294 | */ | ||
295 | |||
296 | unsigned long long sched_clock(void) | ||
297 | { | ||
298 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
299 | } | ||
300 | |||
301 | |||
302 | void __init start_cpu_itimer(void) | 291 | void __init start_cpu_itimer(void) |
303 | { | 292 | { |
304 | unsigned int cpu = smp_processor_id(); | 293 | unsigned int cpu = smp_processor_id(); |