diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-03 07:55:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-03 07:57:02 +0200 |
| commit | 68e90740284c69292881cd38c7ece6f09a18a58f (patch) | |
| tree | 0b0793ae79a06e6e3bb9ae409f077eb6aabe5786 /drivers/clocksource/tcb_clksrc.c | |
| parent | Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
| parent | clocksource: arm_arch_timer: Use clocksource for suspend timekeeping (diff) | |
| download | linux-68e90740284c69292881cd38c7ece6f09a18a58f.tar.xz linux-68e90740284c69292881cd38c7ece6f09a18a58f.zip | |
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>
Diffstat (limited to 'drivers/clocksource/tcb_clksrc.c')
0 files changed, 0 insertions, 0 deletions