From 257c623d494eff192bde46ea90334cae8c9b9c4c Mon Sep 17 00:00:00 2001 From: Changhwan Youn Date: Fri, 2 Sep 2011 14:10:52 +0900 Subject: [PATCH] --- yaml --- r: 264009 b: refs/heads/master c: aa421c13a9e318a75b42d9dd2eb85cc73d8aab6b h: refs/heads/master i: 264007: 9738e3bee595a49f99459153f56fcc858fcfa4cd v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos4/mct.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c5d5ca9debcb..c28ca18c828f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bd0fe1c78623062263cf5ae875fd484c5b8256d +refs/heads/master: aa421c13a9e318a75b42d9dd2eb85cc73d8aab6b diff --git a/trunk/arch/arm/mach-exynos4/mct.c b/trunk/arch/arm/mach-exynos4/mct.c index f3638fa73e62..ddd86864fb83 100644 --- a/trunk/arch/arm/mach-exynos4/mct.c +++ b/trunk/arch/arm/mach-exynos4/mct.c @@ -132,12 +132,18 @@ static cycle_t exynos4_frc_read(struct clocksource *cs) return ((cycle_t)hi << 32) | lo; } +static void exynos4_frc_resume(struct clocksource *cs) +{ + exynos4_mct_frc_start(0, 0); +} + struct clocksource mct_frc = { .name = "mct-frc", .rating = 400, .read = exynos4_frc_read, .mask = CLOCKSOURCE_MASK(64), .flags = CLOCK_SOURCE_IS_CONTINUOUS, + .resume = exynos4_frc_resume, }; static void __init exynos4_clocksource_init(void)