From c952ad7b4a06f0e4f894afb739b2ecf738d31c57 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 1 Jun 2013 18:00:10 +0200 Subject: [PATCH] backports: no kfifo.h when !CPTCFG_BACKPORT_BUILD_KFIFO When CPTCFG_BACKPORT_BUILD_KFIFO is not selected the default kernel header file should be used and not the backport code from backports. On RHEL 6.4 the kfido-new.h is included instead of the normal kfifo.h. The kfifo backport code is only build when CPTCFG_BACKPORT_BUILD_KFIFO is set and not depending on some kernel version. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- backport/backport-include/linux/kfifo.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backport/backport-include/linux/kfifo.h b/backport/backport-include/linux/kfifo.h index 398b00d0196c..49de20e67dd0 100644 --- a/backport/backport-include/linux/kfifo.h +++ b/backport/backport-include/linux/kfifo.h @@ -1,7 +1,11 @@ #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) +#ifndef CPTCFG_BACKPORT_BUILD_KFIFO +#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) #include_next #else +#include +#endif +#else /* * A generic kernel FIFO implementation * -- 2.30.2