diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-24 10:11:12 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-24 10:11:12 +0100 |
| commit | fe31fca35d6af9176eec0024fac2ceeaacbc8639 (patch) | |
| tree | 8a08632cb92784bb8ca6ffab0a5ecca65ebbd8e9 /kernel/time/hrtimer.c | |
| parent | 9bc7491906b4113b4c5ae442157c7dfc4e10cd14 (diff) | |
| parent | 9a4a445e30f0b601ca2d9433274047cbf48ebf9e (diff) | |
| download | linux-fe31fca35d6af9176eec0024fac2ceeaacbc8639.tar.gz | |
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
Diffstat (limited to 'kernel/time/hrtimer.c')
| -rw-r--r-- | kernel/time/hrtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index b663653a5d5b93..b67ebeaa447bae 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -266,7 +266,7 @@ lock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) /* * Divide a ktime value by a nanosecond value */ -u64 ktime_divns(const ktime_t kt, s64 div) +u64 __ktime_divns(const ktime_t kt, s64 div) { u64 dclc; int sft = 0; @@ -282,7 +282,7 @@ u64 ktime_divns(const ktime_t kt, s64 div) return dclc; } -EXPORT_SYMBOL_GPL(ktime_divns); +EXPORT_SYMBOL_GPL(__ktime_divns); #endif /* BITS_PER_LONG >= 64 */ /* |