diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/clocksource.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/clocksource.h')
| -rw-r--r-- | include/linux/clocksource.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 7dff1963c185..308918928767 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h | |||
| @@ -194,6 +194,9 @@ extern void clocksource_suspend(void); | |||
| 194 | extern void clocksource_resume(void); | 194 | extern void clocksource_resume(void); |
| 195 | extern struct clocksource * __init clocksource_default_clock(void); | 195 | extern struct clocksource * __init clocksource_default_clock(void); |
| 196 | extern void clocksource_mark_unstable(struct clocksource *cs); | 196 | extern void clocksource_mark_unstable(struct clocksource *cs); |
| 197 | extern void | ||
| 198 | clocksource_start_suspend_timing(struct clocksource *cs, u64 start_cycles); | ||
| 199 | extern u64 clocksource_stop_suspend_timing(struct clocksource *cs, u64 now); | ||
| 197 | 200 | ||
| 198 | extern u64 | 201 | extern u64 |
| 199 | clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, u64 *max_cycles); | 202 | clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, u64 *max_cycles); |
