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/arm/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/arm/kernel/time.c')
-rw-r--r-- | arch/arm/kernel/time.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 3c8cdcfe8d4a..ee47c532e210 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -78,16 +78,6 @@ static unsigned long dummy_gettimeoffset(void) | |||
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | /* | 80 | /* |
81 | * Scheduler clock - returns current time in nanosec units. | ||
82 | * This is the default implementation. Sub-architecture | ||
83 | * implementations can override this. | ||
84 | */ | ||
85 | unsigned long long __attribute__((weak)) sched_clock(void) | ||
86 | { | ||
87 | return (unsigned long long)jiffies * (1000000000 / HZ); | ||
88 | } | ||
89 | |||
90 | /* | ||
91 | * An implementation of printk_clock() independent from | 81 | * An implementation of printk_clock() independent from |
92 | * sched_clock(). This avoids non-bootable kernels when | 82 | * sched_clock(). This avoids non-bootable kernels when |
93 | * printk_clock is enabled. | 83 | * printk_clock is enabled. |