diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-06-01 18:00:10 +0200 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-06-05 21:35:49 -0700 |
commit | c952ad7b4a06f0e4f894afb739b2ecf738d31c57 (patch) | |
tree | bc0fdbd3547bbb3511440bc8c9ff367a68c018d8 | |
parent | 333e1b4f6db07f8c27fc3f55d4fce12c0877b3b0 (diff) |
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>
-rw-r--r-- | backport/backport-include/linux/kfifo.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/backport/backport-include/linux/kfifo.h b/backport/backport-include/linux/kfifo.h index 398b00d0..49de20e6 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 * |