diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 08:43:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 08:43:52 -0800 |
| commit | c28800a9c3caaf387d85ac665a25ebe99e480295 (patch) | |
| tree | 401ba805709a65a9f5c1919b3dc763c70b64b38f /include/linux | |
| parent | ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22 (diff) | |
| parent | 27c9cd7e601632b3794e1c3344d37b86917ffb43 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hrtimer: Fix extra wakeups from __remove_hrtimer()
timekeeping: add arch_offset hook to ktime_get functions
clocksource: Avoid selecting mult values that might overflow when adjusted
time: Improve documentation of timekeeeping_adjust()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clocksource.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 139c4db55f1..c86c940d1de 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -156,6 +156,7 @@ extern u64 timecounter_cyc2time(struct timecounter *tc, * @mult: cycle to nanosecond multiplier * @shift: cycle to nanosecond divisor (power of two) * @max_idle_ns: max idle time permitted by the clocksource (nsecs) + * @maxadj maximum adjustment value to mult (~11%) * @flags: flags describing special properties * @archdata: arch-specific data * @suspend: suspend function for the clocksource, if necessary @@ -172,7 +173,7 @@ struct clocksource { u32 mult; u32 shift; u64 max_idle_ns; - + u32 maxadj; #ifdef CONFIG_ARCH_CLOCKSOURCE_DATA struct arch_clocksource_data archdata; #endif |