From patchwork Wed Jun 1 07:32:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1701 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:54:30 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs293038vdc; Wed, 1 Jun 2011 00:33:16 -0700 (PDT) Received: by 10.146.26.23 with SMTP id 23mr5776849yaz.33.1306913580254; Wed, 01 Jun 2011 00:33:00 -0700 (PDT) Received: from e6.ny.us.ibm.com (e6.ny.us.ibm.com [32.97.182.146]) by mx.google.com with ESMTPS id f35si1898014anj.79.2011.06.01.00.32.59 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Jun 2011 00:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.146 as permitted sender) client-ip=32.97.182.146; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.146 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p5178jaO030431 for ; Wed, 1 Jun 2011 03:08:45 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p517WtVg090230 for ; Wed, 1 Jun 2011 03:32:55 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p513Wh7W011164 for ; Wed, 1 Jun 2011 00:32:43 -0300 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p513WfhX011107; Wed, 1 Jun 2011 00:32:42 -0300 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 248DB1E7511; Wed, 1 Jun 2011 00:32:53 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Jeff Dike , Thomas Gleixner Subject: [PATCH 3/6] clocksource: um: convert to clocksource_register_hz/khz Date: Wed, 1 Jun 2011 00:32:47 -0700 Message-Id: <1306913570-9445-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1306913570-9445-1-git-send-email-john.stultz@linaro.org> References: <1306913570-9445-1-git-send-email-john.stultz@linaro.org> From: John Stultz This converts the um clocksource to use clocksource_register_hz/khz This is untested, so any assistance in testing would be appreciated! CC: Jeff Dike CC: Thomas Gleixner Signed-off-by: John Stultz --- arch/um/kernel/time.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index a08d9fa..82a6e22 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -75,8 +75,6 @@ static struct clocksource itimer_clocksource = { .rating = 300, .read = itimer_read, .mask = CLOCKSOURCE_MASK(64), - .mult = 1000, - .shift = 0, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -94,9 +92,9 @@ 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); + err = clocksource_register_hz(&itimer_clocksource, USEC_PER_SEC); if (err) { - printk(KERN_ERR "clocksource_register returned %d\n", err); + printk(KERN_ERR "clocksource_register_hz returned %d\n", err); return; } clockevents_register_device(&itimer_clockevent);