Fix compilation issues on Rocky Linux 9.x

push143smart · push143smart · commit 2781746c7767 · 2024-02-05T12:58:28.000+05:30
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
@@ -82,13 +82,6 @@
 
 #include "hpec/hpec_user.h"
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #if defined(EMPULSE) && defined(EMFLASH)
 #error "You cannot define both EMPULSE and EMFLASH"
 #endif
diff --git a/drivers/dahdi/voicebus/vpmoct.h b/drivers/dahdi/voicebus/vpmoct.h
@@ -30,13 +30,6 @@
 #include <linux/timer.h>
 #include "dahdi/kernel.h"
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #define VPMOCT_FIRM_HEADER_LEN 32
 #define VPMOCT_BOOT_RAM_LEN 128
 #define VPMOCT_FLASH_BUF_SECTIONS 4
diff --git a/drivers/dahdi/wcaxx-base.c b/drivers/dahdi/wcaxx-base.c
@@ -34,13 +34,6 @@
 #include <linux/firmware.h>
 #include <linux/crc32.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
 /* Define this if you would like to load the modules in parallel.  While this
  * can speed up loads when multiple cards handled by this driver are installed,
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
@@ -42,13 +42,6 @@
 #include <linux/crc32.h>
 #include <linux/slab.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #include <dahdi/kernel.h>
 
 #include "wct4xxp.h"
diff --git a/drivers/dahdi/wct4xxp/vpm450m.c b/drivers/dahdi/wct4xxp/vpm450m.c
@@ -29,13 +29,6 @@
 
 #include <dahdi/kernel.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #include "vpm450m.h"
 #include <oct612x.h>
 
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
@@ -40,14 +40,6 @@
 #include <linux/timer.h>
 #include <dahdi/kernel.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 #include <linux/sched/signal.h>
 #endif /* 4.11.0 */
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
@@ -54,13 +54,6 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00 db
 #include <linux/crc32.h>
 #include <linux/slab.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
 /* Define this if you would like to load the modules in parallel.  While this
  * can speed up loads when multiple cards handled by this driver are installed,
diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c
@@ -36,13 +36,6 @@
 #include <linux/crc32.h>
 #include <dahdi/kernel.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #include "wct4xxp/wct4xxp.h"	/* For certain definitions */
 #include "wcxb.h"
 #include "wcxb_spi.h"
diff --git a/drivers/dahdi/wcte43x-base.c b/drivers/dahdi/wcte43x-base.c
@@ -43,13 +43,6 @@
 #include <linux/firmware.h>
 #include <oct612x.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #include <dahdi/kernel.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
diff --git a/drivers/dahdi/wcxb.c b/drivers/dahdi/wcxb.c
@@ -36,13 +36,6 @@
 
 #include <dahdi/kernel.h>
 
-/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
-#include <asm/types.h>
-#else
-#include <stdbool.h>
-#endif
-
 #include "wcxb.h"
 #include "wcxb_spi.h"
 #include "wcxb_flash.h"
diff --git a/drivers/dahdi/wcxb_spi.h b/drivers/dahdi/wcxb_spi.h
@@ -29,6 +29,9 @@
 /* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
 #include <asm/types.h>
+#elif defined(RHEL_RELEASE_CODE) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0) && \
+              RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,1)
+#include <asm/types.h>
 #else
 #include <stdbool.h>
 #endif
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
@@ -62,6 +62,16 @@
 #define netif_napi_add netif_napi_add_weight
 #endif
 
+/* Linux kernel 5.16 and greater has removed user-space headers from the kernel include path */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
+#include <asm/types.h>
+#elif defined(RHEL_RELEASE_CODE) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0) && \
+              RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,1)
+#include <asm/types.h>
+#else
+#include <stdbool.h>
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -1552,6 +1562,12 @@ static inline void *PDE_DATA(const struct inode *inode)
 #endif
 #endif
 
+#if defined(RHEL_RELEASE_CODE) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0) && \
+              RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9,1)
+#define netif_napi_add netif_napi_add_weight
+#define PDE_DATA(i)     pde_data(i)
+#endif
+
 #ifndef TIMER_DATA_TYPE
 #define TIMER_DATA_TYPE struct timer_list *
 #endif
