Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=791a644a8d73a9b95515f074afbb3caa0a9964fa
Commit:     791a644a8d73a9b95515f074afbb3caa0a9964fa
Parent:     31ccc1f524b626abcf5e043ad32b881219223c34
Author:     Jeff Dike <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 01:27:25 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 09:43:08 2007 -0700

    uml: clocksource support
    
    Add clocksource support.
    
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Cc: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/um/kernel/time.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 0167848..3cb7135 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -97,6 +97,21 @@ static irqreturn_t um_timer(int irq, void *dev)
        return IRQ_HANDLED;
 }
 
+static cycle_t itimer_read(void)
+{
+       return os_nsecs();
+}
+
+static struct clocksource itimer_clocksource = {
+       .name           = "itimer",
+       .rating         = 300,
+       .read           = itimer_read,
+       .mask           = CLOCKSOURCE_MASK(64),
+       .mult           = 1,
+       .shift          = 0,
+       .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
 static void __init setup_itimer(void)
 {
        int err;
@@ -111,6 +126,11 @@ static void __init setup_itimer(void)
                clockevent_delta2ns(60 * HZ, &itimer_clockevent);
        itimer_clockevent.min_delta_ns =
                clockevent_delta2ns(1, &itimer_clockevent);
+       err = clocksource_register(&itimer_clocksource);
+       if (err) {
+               printk(KERN_ERR "clocksource_register returned %d\n", err);
+               return;
+       }
        clockevents_register_device(&itimer_clockevent);
 }
 
-
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