diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-01-28 16:40:21 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 11:06:37 +0100 |
| commit | daa00b9caf1b6b022ff8aada7502b5ccc34becf4 (patch) | |
| tree | 242f9ee1049622a41fda46c83fe4536b9b5ef86e /arch/cris/kernel | |
| parent | 60dead5a8c909a650ade5f92f2649db292486af1 (diff) | |
| download | linux-stable-daa00b9caf1b6b022ff8aada7502b5ccc34becf4.tar.gz linux-stable-daa00b9caf1b6b022ff8aada7502b5ccc34becf4.tar.bz2 linux-stable-daa00b9caf1b6b022ff8aada7502b5ccc34becf4.zip | |
CRIS: Add sched_clock to kernel/time.c
Also, clean up some whitespace errors.
Diffstat (limited to 'arch/cris/kernel')
| -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 @@ -/* $Id: time.c,v 1.18 2005/03/04 08:16:17 starvik Exp $ - * +/* * linux/arch/cris/kernel/time.c * * Copyright (C) 1991, 1992, 1995 Linus Torvalds @@ -18,7 +17,7 @@ * Linux/CRIS specific code: * * Authors: Bjorn Wesen - * Johan Adolfsson + * Johan Adolfsson * */ @@ -208,10 +207,16 @@ cris_do_profile(struct pt_regs* regs) #endif #ifdef CONFIG_PROFILING - profile_tick(CPU_PROFILING); + profile_tick(CPU_PROFILING, regs); #endif } +unsigned long long sched_clock(void) +{ + return (unsigned long long)jiffies * (1000000000 / HZ) + + get_ns_in_jiffie(); +} + static int __init init_udelay(void) { |