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/m68k | |
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/m68k')
-rw-r--r-- | arch/m68k/kernel/time.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 2a599c3ed787..4c065f9ceffc 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c | |||
@@ -159,12 +159,3 @@ int do_settimeofday(struct timespec *tv) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | EXPORT_SYMBOL(do_settimeofday); | 161 | EXPORT_SYMBOL(do_settimeofday); |
162 | |||
163 | /* | ||
164 | * Scheduler clock - returns current time in ns units. | ||
165 | */ | ||
166 | unsigned long long sched_clock(void) | ||
167 | { | ||
168 | return (unsigned long long)jiffies*(1000000000/HZ); | ||
169 | } | ||
170 | |||