diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-01-28 10:40:21 -0500 |
---|---|---|
committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 05:06:37 -0500 |
commit | daa00b9caf1b6b022ff8aada7502b5ccc34becf4 (patch) | |
tree | 242f9ee1049622a41fda46c83fe4536b9b5ef86e | |
parent | 60dead5a8c909a650ade5f92f2649db292486af1 (diff) |
CRIS: Add sched_clock to kernel/time.c
Also, clean up some whitespace errors.
-rw-r--r-- | arch/cris/kernel/time.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 7a2cc7efbcf8..b7ad10e3e46c 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* $Id: time.c,v 1.18 2005/03/04 08:16:17 starvik Exp $ | 1 | /* |
2 | * | ||
3 | * linux/arch/cris/kernel/time.c | 2 | * linux/arch/cris/kernel/time.c |
4 | * | 3 | * |
5 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 4 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
@@ -18,7 +17,7 @@ | |||
18 | * Linux/CRIS specific code: | 17 | * Linux/CRIS specific code: |
19 | * | 18 | * |
20 | * Authors: Bjorn Wesen | 19 | * Authors: Bjorn Wesen |
21 | * Johan Adolfsson | 20 | * Johan Adolfsson |
22 | * | 21 | * |
23 | */ | 22 | */ |
24 | 23 | ||
@@ -208,10 +207,16 @@ cris_do_profile(struct pt_regs* regs) | |||
208 | #endif | 207 | #endif |
209 | 208 | ||
210 | #ifdef CONFIG_PROFILING | 209 | #ifdef CONFIG_PROFILING |
211 | profile_tick(CPU_PROFILING); | 210 | profile_tick(CPU_PROFILING, regs); |
212 | #endif | 211 | #endif |
213 | } | 212 | } |
214 | 213 | ||
214 | unsigned long long sched_clock(void) | ||
215 | { | ||
216 | return (unsigned long long)jiffies * (1000000000 / HZ) + | ||
217 | get_ns_in_jiffie(); | ||
218 | } | ||
219 | |||
215 | static int | 220 | static int |
216 | __init init_udelay(void) | 221 | __init init_udelay(void) |
217 | { | 222 | { |