Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=daa00b9caf1b6b022ff8aada7502b5ccc34becf4
Commit:     daa00b9caf1b6b022ff8aada7502b5ccc34becf4
Parent:     60dead5a8c909a650ade5f92f2649db292486af1
Author:     Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 28 16:40:21 2008 +0100
Committer:  Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:37 2008 +0100

    CRIS: Add sched_clock to kernel/time.c
    
    Also, clean up some whitespace errors.
---
 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 7a2cc7e..b7ad10e 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)
 {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to