hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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()
This commit is contained in:
Linus Torvalds 2009-07-31 12:09:57 -07:00
parent d27d4e2a66 c712184368
commit 6eb80e00bf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/clocksource.h
View File

@ -293,7 +293,12 @@ static inline int clocksource_enable(struct clocksource *cs)
if (cs->enable) if (cs->enable)
ret = cs->enable(cs); 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; cs->mult_orig = cs->mult;
return ret; return ret;
@ -309,6 +314,13 @@ static inline int clocksource_enable(struct clocksource *cs)
*/ */
static inline void clocksource_disable(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) if (cs->disable)
cs->disable(cs); cs->disable(cs);
} }