diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-16 09:01:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-16 09:01:55 +0100 |
| commit | ba4e06d68ea4fd2be401d7226c68941892d6bbaf (patch) | |
| tree | a9a7125a8c88ba543e4fcfb907869b97688dee3c /include/linux/clockchips.h | |
| parent | 743146db071c4a828159211a295d12ff4f61752f (diff) | |
| parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) | |
| download | cachepc-linux-ba4e06d68ea4fd2be401d7226c68941892d6bbaf.tar.gz cachepc-linux-ba4e06d68ea4fd2be401d7226c68941892d6bbaf.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependencies for a fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index bdcf358dfce2..0d442e34c349 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -190,9 +190,9 @@ extern void clockevents_config_and_register(struct clock_event_device *dev, extern int clockevents_update_freq(struct clock_event_device *ce, u32 freq); static inline void -clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) +clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 maxsec) { - return clocks_calc_mult_shift(&ce->mult, &ce->shift, NSEC_PER_SEC, freq, minsec); + return clocks_calc_mult_shift(&ce->mult, &ce->shift, NSEC_PER_SEC, freq, maxsec); } extern void clockevents_suspend(void); |