Skip to contentSkip to conversation

drivers/clocksource: sched_clock_register() conversion for 3.13 (via tip/timers/core)

GIT PULL John Stultz 2 participants 2 messages Sep 26, 2013 – Sep 30, 2013

lore
Share & tools
lore
#0 lore raw

Hey Daniel,
Here's the sched_clock_register conversion that Stephen did earlier
this summer, as part of extending the generic sched_clock code to support 64bit counters. Unfortunately the prereqs for this series missed getting into tip/timers/core for 3.12, so I never sent out this pull request. But now that the prereqs are in tip/timers/core for 3.13, I've merge it up and I wanted to go ahead and send this out.

This v2 pull request removes the setup_sched_clock deprecation, as that causes lots of warnings since there's still users in the arch/arm tree.

Let me know if you have any issues or concerns.

thanks
-john

The following changes since commit 389e067032fbb96e439abafae848dd447e4cafb4:

Merge branch 'fortglx/3.12/time' into fortglx/3.13/time (2013-09-16 18:54:07 -0700)

are available in the git repository at:

git://git.linaro.org/people/jstultz/linux.git fordlezcano/3.13/sched-clock64-conversion

for you to fetch changes up to 17deb9c2db01c7813611291d251d8c7dbdfd3c9d:

Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion (2013-09-26 12:05:54 -0700)

----------------------------------------------------------------

John Stultz (1):
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion

Stephen Boyd (10):
clocksource: bcm2835: Switch to sched_clock_register()
clocksource: dbx500-prcmu: Switch to sched_clock_register()
clocksource: dw_apb_timer_of: Switch to sched_clock_register()
clocksource: mxs_timer: Switch to sched_clock_register()
clocksource: nomadik: Switch to sched_clock_register()
clocksource: samsung_pwm_timer: Switch to sched_clock_register()
clocksource: tegra: Switch to sched_clock_register()
clocksource: time-armada-370-xp: Switch to sched_clock_register()
clocksource: sirf: Switch to sched_clock_register() and use 64 bits
clocksource: vf_pit_timer: Switch to sched_clock_register()

 drivers/clocksource/bcm2835_timer.c       | 4 ++--
 drivers/clocksource/clksrc-dbx500-prcmu.c | 5 ++---
 drivers/clocksource/dw_apb_timer_of.c     | 4 ++--
 drivers/clocksource/mxs_timer.c           | 4 ++--
 drivers/clocksource/nomadik-mtu.c         | 4 ++--
 drivers/clocksource/samsung_pwm_timer.c   | 4 ++--
 drivers/clocksource/tegra20_timer.c       | 4 ++--
 drivers/clocksource/time-armada-370-xp.c  | 4 ++--
 drivers/clocksource/timer-prima2.c        | 6 +++---
 drivers/clocksource/vf_pit_timer.c        | 4 ++--
 10 files changed, 21 insertions(+), 22 deletions(-)
#1 lore raw
Quoted 8 lines · John Stultz

Hey Daniel,
Here's the sched_clock_register conversion that Stephen did earlier
this summer, as part of extending the generic sched_clock code to support 64bit counters. Unfortunately the prereqs for this series missed getting into tip/timers/core for 3.12, so I never sent out this pull request. But now that the prereqs are in tip/timers/core for 3.13, I've merge it up and I wanted to go ahead and send this out.

Quoted 4 lines

This v2 pull request removes the setup_sched_clock deprecation, as that causes lots of warnings since there's still users in the arch/arm tree.

Let me know if you have any issues or concerns.

Thanks John,

pulled in my tree as 3.13 material.

-- Daniel

Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog