Commit daa00b9c authored by Jesper Nilsson's avatar Jesper Nilsson

CRIS: Add sched_clock to kernel/time.c

Also, clean up some whitespace errors.
parent 60dead5a
/* $Id: time.c,v 1.18 2005/03/04 08:16:17 starvik Exp $ /*
*
* linux/arch/cris/kernel/time.c * linux/arch/cris/kernel/time.c
* *
* Copyright (C) 1991, 1992, 1995 Linus Torvalds * Copyright (C) 1991, 1992, 1995 Linus Torvalds
...@@ -18,7 +17,7 @@ ...@@ -18,7 +17,7 @@
* Linux/CRIS specific code: * Linux/CRIS specific code:
* *
* Authors: Bjorn Wesen * Authors: Bjorn Wesen
* Johan Adolfsson * Johan Adolfsson
* *
*/ */
...@@ -208,10 +207,16 @@ cris_do_profile(struct pt_regs* regs) ...@@ -208,10 +207,16 @@ cris_do_profile(struct pt_regs* regs)
#endif #endif
#ifdef CONFIG_PROFILING #ifdef CONFIG_PROFILING
profile_tick(CPU_PROFILING); profile_tick(CPU_PROFILING, regs);
#endif #endif
} }
unsigned long long sched_clock(void)
{
return (unsigned long long)jiffies * (1000000000 / HZ) +
get_ns_in_jiffie();
}
static int static int
__init init_udelay(void) __init init_udelay(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment