diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:10:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:10:42 +0100 |
| commit | 367177e50189ab0a983b52f3d3f7eb2a1927db71 (patch) | |
| tree | fed5e93eb35d002e21cb3c2fafbfe38062aaa266 /include/linux/clocksource.h | |
| parent | c2bc11113c50449f23c40b724fe410fc2380a8e9 (diff) | |
| parent | d65670a78cdbfae94f20a9e05ec705871d7cdf2b (diff) | |
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Conflicts:
kernel/time/timekeeping.c
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 139c4db55f17..c86c940d1de3 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 |