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/sh/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/sh/kernel/time.c')
-rw-r--r-- | arch/sh/kernel/time.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index c206c9504c4b..d47e775962e9 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c | |||
@@ -41,14 +41,6 @@ static int null_rtc_set_time(const time_t secs) | |||
41 | void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time; | 41 | void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time; |
42 | int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; | 42 | int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; |
43 | 43 | ||
44 | /* | ||
45 | * Scheduler clock - returns current time in nanosec units. | ||
46 | */ | ||
47 | unsigned long long __attribute__ ((weak)) sched_clock(void) | ||
48 | { | ||
49 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
50 | } | ||
51 | |||
52 | #ifndef CONFIG_GENERIC_TIME | 44 | #ifndef CONFIG_GENERIC_TIME |
53 | void do_gettimeofday(struct timeval *tv) | 45 | void do_gettimeofday(struct timeval *tv) |
54 | { | 46 | { |