[PATCH v2 19/19] backports: fix conflict in swiotlb_nr_tbl() on RHEL 6.4

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The RedHat kernel also provides a implementation for swiotlb_nr_tbl(),
us that one on these kernels.

Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
 backport/backport-include/linux/swiotlb.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/backport/backport-include/linux/swiotlb.h b/backport/backport-include/linux/swiotlb.h
index 836b353..d010d0d 100644
--- a/backport/backport-include/linux/swiotlb.h
+++ b/backport/backport-include/linux/swiotlb.h
@@ -8,10 +8,12 @@
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) */
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0))
+#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4))
 static inline unsigned long swiotlb_nr_tbl(void)
 {
 	return 0;
 }
 #endif
+#endif
 
 #endif /* __BACKPORT_LINUX_SWIOTLB_H */
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux