diff options
| author | John Stultz | 2013-09-16 18:52:52 -0700 |
|---|---|---|
| committer | John Stultz | 2013-09-16 18:52:52 -0700 |
| commit | 19c3205ceaffc8f860acf61537fa211087e4b8fc (patch) | |
| tree | 36a232e278c4d7f8d893ba211aec7c8d07743e09 /include | |
| parent | 272b98c6455f00884f0350f775c5342358ebb73f (diff) | |
| parent | e7e3ff1bfe9c42ee31172e9afdc0383a9e595e29 (diff) | |
Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
Merge in 64bit sched_clock support that missed 3.12.
Conflicts:
kernel/time/sched_clock.c
Signed-off-by: John.Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clocksource.h | 2 | ||||
| -rw-r--r-- | include/linux/sched_clock.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index dbbf8aa7731b..67301a405712 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -292,6 +292,8 @@ extern void clocksource_resume(void); extern struct clocksource * __init __weak clocksource_default_clock(void); extern void clocksource_mark_unstable(struct clocksource *cs); +extern u64 +clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask); extern void clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec); diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h index fa7922c80a41..eca7abeb86fc 100644 --- a/include/linux/sched_clock.h +++ b/include/linux/sched_clock.h @@ -15,6 +15,8 @@ static inline void sched_clock_postinit(void) { } #endif extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); +extern void sched_clock_register(u64 (*read)(void), int bits, + unsigned long rate); extern unsigned long long (*sched_clock_func)(void); |