Merge tag 'fortglx-3.20-time' of https://git.linaro.org/people/john.stultz/linux into timers/core

Pull time updates from John Stultz for 3.20: * ktime division optimization * Expose a few more y2038-safe timekeeping interfaces * RTC core changes to address y2038

Thomas Gleixner committed 11 years ago

Commit fe31fca2 parents 9bc7491 9a4a44510 files · +63 −46Browse files

Showing the changes to kernel/time/hrtimer.c (1 of 10 files). Show all

Unified · Split

kernel/time/hrtimer.c+2−2

@@ -266,7 +266,7 @@ lock_hrtimer_base(const struct hrtimer timer, unsigned long flags) · 265 unmodified lines
266	/*	266	/*
267	* Divide a ktime value by a nanosecond value	267	* Divide a ktime value by a nanosecond value
268	*/	268	*/
269	u64 ktime_divns(const ktime_t kt, s64 div)	269	u64 __ktime_divns(const ktime_t kt, s64 div)
270	{	270	{
271	u64 dclc;	271	u64 dclc;
272	int sft = 0;	272	int sft = 0;
@@ -282,7 +282,7 @@ u64 ktime_divns(const ktime_t kt, s64 div) · 9 unmodified lines
282		282
283	return dclc;	283	return dclc;
284	}	284	}
285	EXPORT_SYMBOL_GPL(ktime_divns);	285	EXPORT_SYMBOL_GPL(__ktime_divns);
286	#endif /* BITS_PER_LONG >= 64 */	286	#endif /* BITS_PER_LONG >= 64 */
287		287
288	/*	288	/*