[GIT PULL] Timekeeping changes for 3.11 (part 2)

From: John Stultz
Date: Mon Jun 17 2013 - 14:37:53 EST


Hey Thomas,
Here's the second chunk of changes I have pending for 3.11. Its mostly the changes to make arm's sched_clock implementation generic.

Let me know if you have any objection.

thanks
-john



The following changes since commit 762cf9695d714d312ef7369bed1b9f9467c9e64e:

Merge branch 'timers/clockevents' of git://git.linaro.org/people/dlezcano/clockevents into timers/core (2013-06-08 22:58:27 +0200)

are available in the git repository at:


git://git.linaro.org/people/jstultz/linux.git fortglx/3.11/time

for you to fetch changes up to 38ff87f77af0b5a93fc8581cff1d6e5692ab8970:

sched_clock: Make ARM's sched_clock generic for all architectures (2013-06-12 14:02:13 -0700)

----------------------------------------------------------------
Marcus Gelderie (1):
alarmtimer: Export symbols of functions declared in linux/alarmtimer.h

Stephen Boyd (3):
ARM: sched_clock: Remove unused needs_suspend member
ARM: sched_clock: Return suspended count earlier
sched_clock: Make ARM's sched_clock generic for all architectures

arch/arm/Kconfig | 1 +
arch/arm/common/timer-sp.c | 2 +-
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/arch_timer.c | 2 +-
arch/arm/kernel/time.c | 4 +---
arch/arm/mach-davinci/time.c | 2 +-
arch/arm/mach-imx/time.c | 2 +-
arch/arm/mach-integrator/integrator_ap.c | 2 +-
arch/arm/mach-ixp4xx/common.c | 2 +-
arch/arm/mach-mmp/time.c | 2 +-
arch/arm/mach-msm/timer.c | 2 +-
arch/arm/mach-omap1/time.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/mach-pxa/time.c | 2 +-
arch/arm/mach-sa1100/time.c | 2 +-
arch/arm/mach-u300/timer.c | 2 +-
arch/arm/plat-iop/time.c | 2 +-
arch/arm/plat-omap/counter_32k.c | 2 +-
arch/arm/plat-orion/time.c | 2 +-
arch/arm/plat-samsung/samsung-time.c | 2 +-
arch/arm/plat-versatile/sched-clock.c | 2 +-
drivers/clocksource/bcm2835_timer.c | 2 +-
drivers/clocksource/clksrc-dbx500-prcmu.c | 3 +--
drivers/clocksource/dw_apb_timer_of.c | 3 +--
drivers/clocksource/mxs_timer.c | 2 +-
drivers/clocksource/nomadik-mtu.c | 2 +-
drivers/clocksource/samsung_pwm_timer.c | 2 +-
drivers/clocksource/tegra20_timer.c | 2 +-
drivers/clocksource/time-armada-370-xp.c | 2 +-
drivers/clocksource/timer-marco.c | 2 +-
drivers/clocksource/timer-prima2.c | 2 +-
{arch/arm/include/asm => include/linux}/sched_clock.h | 9 +++++++--
init/Kconfig | 3 +++
init/main.c | 2 ++
kernel/time/Makefile | 1 +
kernel/time/alarmtimer.c | 10 +++++++++-
{arch/arm/kernel => kernel/time}/sched_clock.c | 10 ++++------
37 files changed, 57 insertions(+), 43 deletions(-)
rename {arch/arm/include/asm => include/linux}/sched_clock.h (75%)
rename {arch/arm/kernel => kernel/time}/sched_clock.c (99%)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/