Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933296Ab3CUOGb (ORCPT ); Thu, 21 Mar 2013 10:06:31 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:56380 "EHLO mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933176Ab3CUOG2 (ORCPT ); Thu, 21 Mar 2013 10:06:28 -0400 Message-ID: <514B13E2.2050201@gmail.com> Date: Thu, 21 Mar 2013 09:06:26 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130221 Thunderbird/17.0.3 MIME-Version: 1.0 To: Arnd Bergmann CC: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "devicetree-discuss@lists.ozlabs.org" , linus.walleij@linaro.org, Russell King , haojian.zhuang@linaro.org, pawel.moll@arm.com, john.stultz@linaro.org, tglx@linutronix.de, Rob Herring Subject: Re: [PATCH 00/11] sp804 and integrator timer CLKSRC_OF support References: <1363820051-24428-1-git-send-email-robherring2@gmail.com> <201303211324.37654.arnd@arndb.de> In-Reply-To: <201303211324.37654.arnd@arndb.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1596 Lines: 48 On 03/21/2013 08:24 AM, Arnd Bergmann wrote: > On Wednesday 20 March 2013, Rob Herring wrote: >> This series is dependent on my CLKSRC_OF clean-up in arm-soc, my >> sched_clock selection series[1], and Arnd's default machine descriptor >> patch (for default clocksource_of_init call). The full series is >> available here: > > All your patches look good to me, but I'd suggest you don't depend on > my default machine descriptor patch yet, that just makes the dependencies > harder to track, and we can easily remove all the calls once they > are obsoletely. > I really only need the hunk that calls clocksource_of_init which is really somewhat unrelated to a default machine desc. So what if I just pull out this hunk to a separate patch: diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 955d92d..abff4e9 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -115,6 +116,10 @@ int __init register_persistent_clock(clock_access_fn read_boot, void __init time_init(void) { - machine_desc->init_time(); + if (machine_desc->init_time) + machine_desc->init_time(); + else + clocksource_of_init(); + sched_clock_postinit(); } -- 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/