From patchwork Mon Jul 1 21:49:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11026811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6395818E8 for ; Mon, 1 Jul 2019 21:50:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5965C286E2 for ; Mon, 1 Jul 2019 21:50:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DFBB28793; Mon, 1 Jul 2019 21:50:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06623286E2 for ; Mon, 1 Jul 2019 21:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726979AbfGAVuH (ORCPT ); Mon, 1 Jul 2019 17:50:07 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:46028 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727028AbfGAVuH (ORCPT ); Mon, 1 Jul 2019 17:50:07 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 73328A1052; Mon, 1 Jul 2019 23:50:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id JMiVZKfFSx-u; Mon, 1 Jul 2019 23:49:57 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 12/18] header: add hrtimer_forward() and ns_to_ktime() Date: Mon, 1 Jul 2019 23:49:07 +0200 Message-Id: <20190701214914.8066-13-hauke@hauke-m.de> In-Reply-To: <20190701214914.8066-1-hauke@hauke-m.de> References: <20190701214914.8066-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ktime_t was converted from the union to s64 in kernel 4.10. hrtimer_start() was already converted some time ago in backports, now mac80211_hwsim uses hrtimer_start() together with the newly added functions. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/interrupt.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/backport/backport-include/linux/interrupt.h b/backport/backport-include/linux/interrupt.h index ad3cbf66..f7e7134d 100644 --- a/backport/backport-include/linux/interrupt.h +++ b/backport/backport-include/linux/interrupt.h @@ -5,6 +5,25 @@ #include #if LINUX_VERSION_IS_LESS(4,10,0) + +/* Forward a hrtimer so it expires after now: */ +static inline u64 +backport_hrtimer_forward(struct hrtimer *timer, ktime_t now, s64 interval) +{ + ktime_t _interval = { .tv64 = interval }; + + return hrtimer_forward(timer, now, _interval); +} +#define hrtimer_forward LINUX_BACKPORT(hrtimer_forward) + +static inline s64 backport_ns_to_ktime(u64 ns) +{ + ktime_t _time = ns_to_ktime(ns); + + return _time.tv64; +} +#define ns_to_ktime LINUX_BACKPORT(ns_to_ktime) + static inline void backport_hrtimer_start(struct hrtimer *timer, s64 time, const enum hrtimer_mode mode) {