From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 3 Oct 2013 05:55:07 +0000 (+0200)
Subject: Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=68e90740284c69292881cd38c7ece6f09a18a58f;p=linux-beck.git

Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into timers/core

Pull (mostly) ARM clocksource driver updates from Daniel Lezcano:

" - Soren Brinkmann added FEAT_PERCPU to a clock device when it is local
    per cpu. This feature prevents the clock framework to choose a per cpu
    timer as a broadcast timer. This problem arised when the ARM global
    timer is used when switching to the broadcast timer which is the case
    now on Xillinx with its cpuidle driver.

  - Stephen Boyd extended the generic sched_clock code to support 64bit
    counters and removes the setup_sched_clock deprecation, as that causes
    lots of warnings since there's still users in the arch/arm tree. He
    added also the CLOCK_SOURCE_SUSPEND_NONSTOP flag on the architected
    timer as they continue counting during suspend.

  - Uwe Kleine-König added some missing __init sections and consolidated the
    code by moving the of_node_put call from the drivers to the function
    clocksource_of_init. "

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

68e90740284c69292881cd38c7ece6f09a18a58f
diff --cc drivers/clocksource/clksrc-of.c
index b9ddd9e3a2f5,8b2ed14f121d..35639cf4e5a2
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@@ -30,10 -30,8 +30,11 @@@ void __init clocksource_of_init(void
  	clocksource_of_init_fn init_func;
  
  	for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
 +		if (!of_device_is_available(np))
 +			continue;
 +
  		init_func = match->data;
  		init_func(np);
+ 		of_node_put(np);
  	}
  }