From 5bb729709380c458fd530901b2978be4f635d35d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 19 Aug 2013 01:38:04 +0200 Subject: [PATCH] backports: fix conflict in swiotlb_nr_tbl() on RHEL 6.4 The RedHat kernel also provides a implementation for swiotlb_nr_tbl(), us that one on these kernels. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- 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 836b353815b9..d010d0dcc532 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 */ -- 2.30.2