Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765721AbXILVRM (ORCPT ); Wed, 12 Sep 2007 17:17:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762051AbXILVQ6 (ORCPT ); Wed, 12 Sep 2007 17:16:58 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:55966 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757670AbXILVQ5 (ORCPT ); Wed, 12 Sep 2007 17:16:57 -0400 Date: Wed, 12 Sep 2007 17:16:48 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 7/11] UML - clocksource support Message-ID: <20070912211648.GA10272@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1541 Lines: 51 Add clocksource support. Signed-off-by: Jeff Dike -- arch/um/kernel/time.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) Index: linux-2.6.22/arch/um/kernel/time.c =================================================================== --- linux-2.6.22.orig/arch/um/kernel/time.c 2007-09-12 15:12:11.000000000 -0400 +++ linux-2.6.22/arch/um/kernel/time.c 2007-09-12 15:12:35.000000000 -0400 @@ -97,6 +97,21 @@ static irqreturn_t um_timer(int irq, voi 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; @@ -108,6 +123,12 @@ static void __init setup_itimer(void) printk(KERN_ERR "register_timer : request_irq failed - " "errno = %d\n", -err); + err = clocksource_register(&itimer_clocksource); + if (err) { + printk(KERN_ERR "clocksource_register returned %d\n", err); + return; + } + itimer_clockevent.mult = div_sc(HZ, NSEC_PER_SEC, 32); itimer_clockevent.max_delta_ns = clockevent_delta2ns(60 * HZ, &itimer_clockevent); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/