diff mbox series

backport: check Ubuntu kernel for u64_stats_update_begin_irqsave()

Message ID 20181001072657.17277-1-luca@coelho.fi (mailing list archive)
State Accepted
Headers show
Series backport: check Ubuntu kernel for u64_stats_update_begin_irqsave() | expand

Commit Message

Luca Coelho Oct. 1, 2018, 7:26 a.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

Ubuntu cherry-picked the patch that added
u64_stat_update_begin_irqsave() in their 4.15 kernel, so we get a
redefinition compilation error if we try to compile against that.

To solve this, check UTS_UBUNTU_RELEASE_ABI and don't define our
backported function if it's 33 or higher.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 backport/backport-include/linux/u64_stats_sync.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/backport/backport-include/linux/u64_stats_sync.h b/backport/backport-include/linux/u64_stats_sync.h
index 0d2212382db7..251373a74139 100644
--- a/backport/backport-include/linux/u64_stats_sync.h
+++ b/backport/backport-include/linux/u64_stats_sync.h
@@ -152,7 +152,8 @@  static inline bool u64_stats_fetch_retry_irq(const struct u64_stats_sync *syncp,
 #endif /* LINUX_VERSION_IS_LESS(3,13,0) */
 
 #if LINUX_VERSION_IS_LESS(4,16,0) && \
-    !LINUX_VERSION_IN_RANGE(4,14,44, 4,15,0)
+    !LINUX_VERSION_IN_RANGE(4,14,44, 4,15,0) && \
+    !(LINUX_VERSION_IS_GEQ(4,15,18) && UTS_UBUNTU_RELEASE_ABI >= 33)
 static inline unsigned long
 u64_stats_update_begin_irqsave(struct u64_stats_sync *syncp)
 {