| commit | d256b51fc31f9a224c833d8856e7a574e222c254 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sat Oct 26 13:53:08 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat Oct 26 13:53:08 2013 -0700 |
| tree | f8c2e816a29eabcdf97328960a9f44f26f9ca328 | |
| parent | f8b128a296c1c801534080adb6e5524fc88e08a2 [diff] | |
| parent | 051319a98322f02d98b9cf56c729736edc4ede95 [diff] |
Merge "clocksource: arm_arch_timer: Use clocksource for suspend timekeeping"
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c index 9e27592..92e4f18 100644 --- a/arch/arm/kernel/arch_timer.c +++ b/arch/arm/kernel/arch_timer.c
@@ -357,7 +357,7 @@ .rating = 400, .read = arch_counter_read, .mask = CLOCKSOURCE_MASK(56), - .flags = CLOCK_SOURCE_IS_CONTINUOUS, + .flags = CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SUSPEND_NONSTOP, }; static u32 arch_counter_get_cntvct32(void)