summaryrefslogtreecommitdiff
path: root/include/linux/hrtimer.h
diff options
context:
space:
mode:
authorZhi Wang <zhi.a.wang@intel.com>2018-05-14 00:19:07 +0300
committerZhi Wang <zhi.a.wang@intel.com>2018-05-14 00:22:01 +0300
commitbba9525520b6028ecbe7486e13216e9ede8636be (patch)
treef82f4f2adecf6f97933c88050682d44336db783e /include/linux/hrtimer.h
parentcb8ba171ae6c1e4f5fa027162c06d50fc2b43055 (diff)
parent0c79f9cb77eae28d48a4f9fc1b3341aacbbd260c (diff)
downloadlinux-bba9525520b6028ecbe7486e13216e9ede8636be.tar.xz
Merge branch 'drm-intel-next-queued' into gvt-next
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
Diffstat (limited to 'include/linux/hrtimer.h')
-rw-r--r--include/linux/hrtimer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index c7902ca7c9f4..3892e9c8b2de 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -426,6 +426,7 @@ static inline ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
}
extern u64 hrtimer_get_next_event(void);
+extern u64 hrtimer_next_event_without(const struct hrtimer *exclude);
extern bool hrtimer_active(const struct hrtimer *timer);