summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-07-13 09:01:13 +0200
committerJiri Slaby <jslaby@suse.cz>2016-07-21 08:36:05 +0200
commita882416d65dd12e4e4bb2000a2294df885a8bd4b (patch)
tree23a6e0347a732ad9312c1e94e2c8225dd287cedb /kernel
parentfd0d40b9370853c02102c22b91ff7c3cd1077e8b (diff)
downloadlwn-a882416d65dd12e4e4bb2000a2294df885a8bd4b.tar.gz
lwn-a882416d65dd12e4e4bb2000a2294df885a8bd4b.zip
ktime: export ktime_divns
ktime_divns was exported in upstream as a side-effect of commit 166afb64511eef08e13331b970c44fe91cea45ef (ktime: Sanitize ktime_to_us/ms conversion). But we do not want the commit given ktime is not nanoseconds in 3.12 yet. So we only export the function here as it is needed by upstream commit d2c5cf88d5282de258f4eb6ab40040b80a075cd8 (ALSA: hrtimer: Handle start/stop more properly): ERROR: "ktime_divns" [sound/core/snd-hrtimer.ko] undefined! Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hrtimer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index aa149222cd8e..63903212933a 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -349,6 +349,7 @@ u64 ktime_divns(const ktime_t kt, s64 div)
return dclc;
}
+EXPORT_SYMBOL_GPL(ktime_divns);
#endif /* BITS_PER_LONG >= 64 */
/*