clocksource/ux500-prcmu: fix sched_clock breakage
PATCH 1/1 clocksource/ux500-prcmu: fix sched_clock breakage
commit 2f0778afac79bd8d226225556858a636931eeabc adding runtime-selectable sched_clock() forgot to patch this driver down in drivers/clocksource, this patch fixes the problem.
--- drivers/clocksource/clksrc-dbx500-prcmu.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-)
drivers/clocksource/clksrc-dbx500-prcmu.c +3 -13
@@ -58,25 +58,15 @@ static struct clocksource clocksource_dbx500_prcmu = { };#ifdef CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK -static DEFINE_CLOCK_DATA (cd); -unsigned long long notrace sched_clock (void ) +static u32 notrace dbx500_prcmu_sched_clock_read(void) { -u32 cyc; -if (unlikely (!clksrc_dbx500_timer_base))return 0 ; - cyc =clksrc_dbx500_prcmu_read (&clocksource_dbx500_prcmu); - -return cyc_to_sched_clock (&cd, cyc, (u32 )~0 ); +return clksrc_dbx500_prcmu_read (&clocksource_dbx500_prcmu); } -static void notrace clksrc_dbx500_prcmu_update_sched_clock(void) -{ -u32 cyc =clksrc_dbx500_prcmu_read (&clocksource_dbx500_prcmu); -update_sched_clock (&cd, cyc, (u32 )~0 ); -}#endif void __init clksrc_dbx500_prcmu_init (void __iomem *base)
@@ -97,7 +87,7 @@ void __init clksrc_dbx500_prcmu_init(void __iomem *base) clksrc_dbx500_timer_base + PRCMU_TIMER_REF); }#ifdef CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK -init_sched_clock (&cd, clksrc_dbx500_prcmu_update_sched_clock, +setup_sched_clock (dbx500_prcmu_sched_clock_read,32 ,RATE_32K );#endif clocksource_calc_mult_shift(&clocksource_dbx500_prcmu,
Signature · 1 line
1.7.8
PATCH 1/1 clocksource/ux500-prcmu: fix sched_clock breakage
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 9 lines · Linus Walleij
commit
2f0778afac79bd8d226225556858a636931eeabcadding runtime-selectablesched_clock()forgot to patch this driver down indrivers/clocksource, this patch fixes the problem.Reported-by Daniel Lezcano <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Compiled and booted the board successfully.
- --
<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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPAdSmAAoJEAKBbMCpUGYAKAAIAMwJ3MKCS2mCM07mI27Cgchu p0342JLh/xiCXeuCGYr8Z1WNGGRsj6GWcLPUs8Uhd8m75o6Hl8s2E+ZC3ki45Uum C5uateI4MAh/gUi68aB8wdpzXQm+vr5SAy4pLaVmNUdS+X9XC8p23E3tmfoO9cWI Ygk4g1Czzx7HQIANiHNeK0Da2juI6Hv7j5JJ2fm0kw25HEMvg0mQlKoF0U7CiYGe KBjoUvR5RG+NcfNplGR+VYjv4xsmDfUo/7AjlPfwJ5n0RPVEJ9R5TAyOtBK/3RA7 6hUJ+KizevpWh8TxbS8Qz9jdkRXaji+5fy/L53+rxc8hKgfK1DNaMs2mt2eK6Qg= =3GNF
-----END PGP SIGNATURE-----
PATCH 1/1 clocksource/ux500-prcmu: fix sched_clock breakage
In reply to Linus WalleijQuoted 8 lines · Linus Walleij
commit
2f0778afac79bd8d226225556858a636931eeabcadding runtime-selectablesched_clock()forgot to patch this driver down indrivers/clocksource, this patch fixes the problem.Reported-by Daniel Lezcano <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Linus Walleij <[email protected]>
M.
Signature · 1 line
Jazz is not dead. It just smells funny...