The IRQF_DISABLED flag was removed in kernel 4.1 with commit "genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely" [1]. Therefore the compilation of ltq-hcd and ltq-vmmc kmods fails. [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc Signed-off-by: Mathias Kresin <openwrt@kresin.me> SVN-Revision: 47180master
parent
c9ef7a49c7
commit
f457ae99f2
@ -0,0 +1,56 @@ |
||||
--- a/src/drv_vmmc_linux.c
|
||||
+++ b/src/drv_vmmc_linux.c
|
||||
@@ -54,6 +54,8 @@
|
||||
#include "drv_vmmc_res.h"
|
||||
#endif /* (VMMC_CFG_FEATURES & VMMC_FEAT_HDLC) */
|
||||
|
||||
+#undef VMMC_USE_PROC
|
||||
+
|
||||
/* ============================= */
|
||||
/* Local Macros & Definitions */
|
||||
/* ============================= */
|
||||
--- a/src/mps/drv_mps_vmmc_linux.c
|
||||
+++ b/src/mps/drv_mps_vmmc_linux.c
|
||||
@@ -80,11 +80,15 @@
|
||||
/* ============================= */
|
||||
#define IFX_MPS_DEV_NAME "ifx_mps"
|
||||
|
||||
+#undef CONFIG_MPS_HISTORY_SIZE
|
||||
+#define CONFIG_MPS_HISTORY_SIZE 0
|
||||
#ifndef CONFIG_MPS_HISTORY_SIZE
|
||||
#define CONFIG_MPS_HISTORY_SIZE 128
|
||||
#warning CONFIG_MPS_HISTORY_SIZE should have been set via cofigure - setting to default 128
|
||||
#endif
|
||||
|
||||
+#undef CONFIG_PROC_FS
|
||||
+
|
||||
/* ============================= */
|
||||
/* Global variable definition */
|
||||
/* ============================= */
|
||||
@@ -2257,7 +2261,7 @@ IFX_int32_t __init ifx_mps_init_module (
|
||||
ifx_mps_reset ();
|
||||
result = request_irq (INT_NUM_IM4_IRL18,
|
||||
#ifdef LINUX_2_6
|
||||
- ifx_mps_ad0_irq, IRQF_DISABLED
|
||||
+ ifx_mps_ad0_irq, 0x0
|
||||
#else /* */
|
||||
(irqreturn_t (*)(int, IFX_void_t *, struct pt_regs *))
|
||||
ifx_mps_ad0_irq, SA_INTERRUPT
|
||||
@@ -2267,7 +2271,7 @@ IFX_int32_t __init ifx_mps_init_module (
|
||||
return result;
|
||||
result = request_irq (INT_NUM_IM4_IRL19,
|
||||
#ifdef LINUX_2_6
|
||||
- ifx_mps_ad1_irq, IRQF_DISABLED
|
||||
+ ifx_mps_ad1_irq, 0x0
|
||||
#else /* */
|
||||
(irqreturn_t (*)(int, IFX_void_t *, struct pt_regs *))
|
||||
ifx_mps_ad1_irq, SA_INTERRUPT
|
||||
@@ -2282,7 +2286,7 @@ IFX_int32_t __init ifx_mps_init_module (
|
||||
sprintf (&voice_channel_int_name[i][0], "mps_mbx vc%d", i);
|
||||
result = request_irq (INT_NUM_IM4_IRL14 + i,
|
||||
#ifdef LINUX_2_6
|
||||
- ifx_mps_vc_irq, IRQF_DISABLED
|
||||
+ ifx_mps_vc_irq, 0x0
|
||||
#else /* */
|
||||
(irqreturn_t (*)
|
||||
(int, IFX_void_t *,
|
@ -1,33 +0,0 @@ |
||||
Index: drv_vmmc-1.9.0/src/drv_vmmc_linux.c
|
||||
===================================================================
|
||||
--- drv_vmmc-1.9.0.orig/src/drv_vmmc_linux.c 2013-09-05 22:34:31.920428685 +0200
|
||||
+++ drv_vmmc-1.9.0/src/drv_vmmc_linux.c 2013-09-05 22:35:54.940430772 +0200
|
||||
@@ -54,6 +54,8 @@
|
||||
#include "drv_vmmc_res.h"
|
||||
#endif /* (VMMC_CFG_FEATURES & VMMC_FEAT_HDLC) */
|
||||
|
||||
+#undef VMMC_USE_PROC
|
||||
+
|
||||
/* ============================= */
|
||||
/* Local Macros & Definitions */
|
||||
/* ============================= */
|
||||
Index: drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_linux.c
|
||||
===================================================================
|
||||
--- drv_vmmc-1.9.0.orig/src/mps/drv_mps_vmmc_linux.c 2013-09-05 22:34:31.988428687 +0200
|
||||
+++ drv_vmmc-1.9.0/src/mps/drv_mps_vmmc_linux.c 2013-09-05 22:54:01.544458009 +0200
|
||||
@@ -80,11 +80,15 @@
|
||||
/* ============================= */
|
||||
#define IFX_MPS_DEV_NAME "ifx_mps"
|
||||
|
||||
+#undef CONFIG_MPS_HISTORY_SIZE
|
||||
+#define CONFIG_MPS_HISTORY_SIZE 0
|
||||
#ifndef CONFIG_MPS_HISTORY_SIZE
|
||||
#define CONFIG_MPS_HISTORY_SIZE 128
|
||||
#warning CONFIG_MPS_HISTORY_SIZE should have been set via cofigure - setting to default 128
|
||||
#endif
|
||||
|
||||
+#undef CONFIG_PROC_FS
|
||||
+
|
||||
/* ============================= */
|
||||
/* Global variable definition */
|
||||
/* ============================= */
|
Loading…
Reference in new issue