summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@openvz.org>2007-02-10 01:45:10 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:28 -0800
commitb035b6de24932ffd4a2b1c6619a2f5711da6920f (patch)
tree76f43316bf4788c510a1f271064b67ef8e584035 /arch/cris
parent5e07e1ccb0c0f25dd748ebe2ef83008c2229bf1c (diff)
downloadlinux-3.10-b035b6de24932ffd4a2b1c6619a2f5711da6920f.tar.gz
linux-3.10-b035b6de24932ffd4a2b1c6619a2f5711da6920f.tar.bz2
linux-3.10-b035b6de24932ffd4a2b1c6619a2f5711da6920f.zip
[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/cris')
-rw-r--r--arch/cris/kernel/time.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c
index 22a1aa511ae..acfd0455940 100644
--- a/arch/cris/kernel/time.c
+++ b/arch/cris/kernel/time.c
@@ -216,14 +216,6 @@ cris_do_profile(struct pt_regs* regs)
#endif
}
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
static int
__init init_udelay(void)
{