diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-10 19:05:00 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-18 23:59:40 +0200 |
| commit | 889f90dadabd3b896805f01096c25bcaaa71eca3 (patch) | |
| tree | 44683023edf697fd5f6aa8684f3aedbe185090b3 | |
| parent | 3d605593eee4429037ffe9788e5e1eafb6f95a49 (diff) | |
| download | backports-889f90dadabd3b896805f01096c25bcaaa71eca3.tar.gz | |
headers: Adapt signature of hrtimer_forward_now()
The hrtimer_forward_now() function is now used by mac80211_hwsim.
In kernel 4.10 the type of the interval parameter of
hrtimer_forward_now() was changed from ktime_t to s64. This change
converts calls using the new version to the old one.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/interrupt.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/backport/backport-include/linux/interrupt.h b/backport/backport-include/linux/interrupt.h index 41d50d7c..f42f2ddd 100644 --- a/backport/backport-include/linux/interrupt.h +++ b/backport/backport-include/linux/interrupt.h @@ -16,6 +16,15 @@ backport_hrtimer_forward(struct hrtimer *timer, ktime_t now, s64 interval) } #define hrtimer_forward LINUX_BACKPORT(hrtimer_forward) +static inline u64 +backport_hrtimer_forward_now(struct hrtimer *timer, s64 interval) +{ + ktime_t _interval = { .tv64 = interval }; + + return hrtimer_forward_now(timer, _interval); +} +#define hrtimer_forward_now LINUX_BACKPORT(hrtimer_forward_now) + static inline s64 backport_ns_to_ktime(u64 ns) { ktime_t _time = ns_to_ktime(ns); |