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/sh64 | |
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/sh64')
-rw-r--r-- | arch/sh64/kernel/time.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 9c4a38a8698c..390b40de7cef 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
@@ -579,12 +579,3 @@ void enter_deep_standby(void) | |||
579 | asm __volatile__ ("nop"); | 579 | asm __volatile__ ("nop"); |
580 | panic("Unexpected wakeup!\n"); | 580 | panic("Unexpected wakeup!\n"); |
581 | } | 581 | } |
582 | |||
583 | /* | ||
584 | * Scheduler clock - returns current time in nanosec units. | ||
585 | */ | ||
586 | unsigned long long sched_clock(void) | ||
587 | { | ||
588 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
589 | } | ||
590 | |||