diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 12:09:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 12:09:57 -0700 |
commit | 6eb80e00bff341dd09a7ec8b9dba6da8410448bf (patch) | |
tree | c0966b7f7d2bb3510de15226a61071abb3d8c453 /include | |
parent | d27d4e2a660939f1bdf74f0e24c4c109f90cd98d (diff) | |
parent | c7121843685de2bf7f3afd3ae1d6a146010bf1fc (diff) | |
download | linux-3.10-6eb80e00bff341dd09a7ec8b9dba6da8410448bf.tar.gz linux-3.10-6eb80e00bff341dd09a7ec8b9dba6da8410448bf.tar.bz2 linux-3.10-6eb80e00bff341dd09a7ec8b9dba6da8410448bf.zip |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: Save mult_orig in clocksource_disable()
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/clocksource.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index c56457c8334..1219be4fb42 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -293,7 +293,12 @@ static inline int clocksource_enable(struct clocksource *cs) if (cs->enable) ret = cs->enable(cs); - /* save mult_orig on enable */ + /* + * The frequency may have changed while the clocksource + * was disabled. If so the code in ->enable() must update + * the mult value to reflect the new frequency. Make sure + * mult_orig follows this change. + */ cs->mult_orig = cs->mult; return ret; @@ -309,6 +314,13 @@ static inline int clocksource_enable(struct clocksource *cs) */ static inline void clocksource_disable(struct clocksource *cs) { + /* + * Save mult_orig in mult so clocksource_enable() can + * restore the value regardless if ->enable() updates + * the value of mult or not. + */ + cs->mult = cs->mult_orig; + if (cs->disable) cs->disable(cs); } |