From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 03/12] header: Add ktime_get_boottime_ns()
Date: Mon, 5 Aug 2019 14:06:55 +0200 [thread overview]
Message-ID: <20190805120704.13128-4-hauke@hauke-m.de> (raw)
In-Reply-To: <20190805120704.13128-1-hauke@hauke-m.de>
ktime_get_boottime_ns() was added in commit 9285ec4c8b61 ("timekeeping:
Use proper clock specifier names in functions") in kernel 5.3. This is
used by multiple drivers.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/timekeeping.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h
index 71871531..25ceaf3e 100644
--- a/backport/backport-include/linux/timekeeping.h
+++ b/backport/backport-include/linux/timekeeping.h
@@ -17,11 +17,17 @@ static inline u64 ktime_get_ns(void)
}
extern ktime_t ktime_get_boottime(void);
-#define ktime_get_boot_ns LINUX_BACKPORT(ktime_get_boot_ns)
-static inline u64 ktime_get_boot_ns(void)
+#define ktime_get_boottime_ns LINUX_BACKPORT(ktime_get_boottime_ns)
+static inline u64 ktime_get_boottime_ns(void)
{
return ktime_to_ns(ktime_get_boottime());
}
+#elif LINUX_VERSION_IS_LESS(5,3,0)
+#define ktime_get_boottime_ns LINUX_BACKPORT(ktime_get_boottime_ns)
+static inline u64 ktime_get_boottime_ns(void)
+{
+ return ktime_get_boot_ns();
+}
#endif /* < 3.17 */
#if LINUX_VERSION_IS_LESS(4,18,0)
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2019-08-05 12:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 12:06 [PATCH 00/12] backports: Update to kernel 5.3-rc3 Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 01/12] patches: Refresh patches against " Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 02/12] header: Add BITS_PER_TYPE() Hauke Mehrtens
2019-08-05 12:06 ` Hauke Mehrtens [this message]
2019-08-05 12:06 ` [PATCH 04/12] header: Add nl80211_validate_nested() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 05/12] header: Add trace_##name##_enabled() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 06/12] header: Remove skb_xmit_more() Hauke Mehrtens
2019-08-05 12:06 ` [PATCH 07/12] backport: Add genl_callback_extack() function Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 08/12] backport: Add arc4 library Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 09/12] patches: Add include in cfg80211.h Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 10/12] patches: Do not use GRO_CONSUMED on kernel < 4.11 Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 11/12] dependencies: Make AIRO depend on kernel 4.20 Hauke Mehrtens
2019-08-05 12:07 ` [PATCH 12/12] kconfig: Update to KConfig to version from kernel 4.17 Hauke Mehrtens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190805120704.13128-4-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=backports@vger.kernel.org \
--cc=johannes@sipsolutions.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).