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 <hauke@xxxxxxxxxx> --- 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 398b00d..49de20e 100644 --- a/backport/backport-include/linux/kfifo.h +++ b/backport/backport-include/linux/kfifo.h @@ -1,7 +1,11 @@ #include <linux/version.h> -#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 <linux/kfifo.h> #else +#include <linux/kfifo-new.h> +#endif +#else /* * A generic kernel FIFO implementation * -- 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
