diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 19:11:29 (GMT) |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 19:11:29 (GMT) |
commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /include/linux/clocksource.h | |
parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
download | linux-fsl-qoriq-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'include/linux/clocksource.h')
-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 139c4db..c86c940 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 |