From patchwork Tue Oct 25 18:08:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@kernel.beaverton.ibm.com X-Patchwork-Id: 4815 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7607823E0E for ; Tue, 25 Oct 2011 18:12:05 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 65531A1817C for ; Tue, 25 Oct 2011 18:12:05 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so1075048faa.11 for ; Tue, 25 Oct 2011 11:12:05 -0700 (PDT) Received: by 10.223.77.69 with SMTP id f5mr52940367fak.3.1319566325289; Tue, 25 Oct 2011 11:12:05 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.1.71 with SMTP id 7cs123484lak; Tue, 25 Oct 2011 11:12:05 -0700 (PDT) Received: by 10.151.92.21 with SMTP id u21mr26368921ybl.82.1319566324139; Tue, 25 Oct 2011 11:12:04 -0700 (PDT) Received: from e5.ny.us.ibm.com (e5.ny.us.ibm.com. [32.97.182.145]) by mx.google.com with ESMTPS id p4si11577386yba.3.2011.10.25.11.12.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 11:12:04 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.145 as permitted sender) client-ip=32.97.182.145; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.145 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Oct 2011 14:10:20 -0400 Received: from d01relay02.pok.ibm.com ([9.56.227.234]) by e5.ny.us.ibm.com ([192.168.1.105]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 25 Oct 2011 14:09:12 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9PI8Rvb362270 for ; Tue, 25 Oct 2011 14:08:29 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9PI8Q8t001850 for ; Tue, 25 Oct 2011 16:08:27 -0200 Received: from kernel.beaverton.ibm.com ([9.47.67.96]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p9PI8Kek001431; Tue, 25 Oct 2011 16:08:21 -0200 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 71C021E74FC; Tue, 25 Oct 2011 11:08:20 -0700 (PDT) From: y@kernel.beaverton.ibm.com To: lkml Cc: John Stultz , Jeff Dike , Thomas Gleixner Subject: [PATCH 3/8] clocksource: um: Convert to clocksource_register_hz/khz Date: Tue, 25 Oct 2011 11:08:11 -0700 Message-Id: <4ea6fbf4.0443960a.0778.ffffaff0SMTPIN_ADDED@mx.google.com> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1319566096-3222-1-git-send-email-y> References: <1319566096-3222-1-git-send-email-y> x-cbid: 11102518-5930-0000-0000-000000912DDE 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);