From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 1 Jun 2013 16:00:10 +0000 (+0200)
Subject: backports: no kfifo.h when !CPTCFG_BACKPORT_BUILD_KFIFO
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c952ad7b4a06f0e4f894afb739b2ecf738d31c57;p=openwrt%2Fstaging%2Fblogic.git

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 <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---

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 <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
  *