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/sparc | |
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/sparc')
-rw-r--r-- | arch/sparc/kernel/time.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 2fcce000d877..9bb1240aaf8a 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -436,15 +436,6 @@ static inline unsigned long do_gettimeoffset(void) | |||
436 | return (*master_l10_counter >> 10) & 0x1fffff; | 436 | return (*master_l10_counter >> 10) & 0x1fffff; |
437 | } | 437 | } |
438 | 438 | ||
439 | /* | ||
440 | * Returns nanoseconds | ||
441 | * XXX This is a suboptimal implementation. | ||
442 | */ | ||
443 | unsigned long long sched_clock(void) | ||
444 | { | ||
445 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
446 | } | ||
447 | |||
448 | /* Ok, my cute asm atomicity trick doesn't work anymore. | 439 | /* Ok, my cute asm atomicity trick doesn't work anymore. |
449 | * There are just too many variables that need to be protected | 440 | * There are just too many variables that need to be protected |
450 | * now (both members of xtime, et al.) | 441 | * now (both members of xtime, et al.) |