diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-11-13 22:18:00 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-02-20 19:25:17 +0100 |
| commit | 73ba5e11f7582967f5151f5a3cb27932b47f44fa (patch) | |
| tree | 0241af7a006b080d82645c31d23115c1ad3b98b4 /package/kernel/lantiq/ltq-vdsl-mei | |
| parent | f8a6987cd1aae8698062c8ac3907193a5c66004a (diff) | |
| download | upstream-73ba5e11f7582967f5151f5a3cb27932b47f44fa.tar.gz upstream-73ba5e11f7582967f5151f5a3cb27932b47f44fa.tar.bz2 upstream-73ba5e11f7582967f5151f5a3cb27932b47f44fa.zip | |
lantiq: fix lantiq applications kernel 4.14 compatiblity
This is fixing multiple compile problems with kernel 4.14 and updates the
code to take care of changes introduced between kernel 4.9 and 4.14.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/kernel/lantiq/ltq-vdsl-mei')
| -rw-r--r-- | package/kernel/lantiq/ltq-vdsl-mei/patches/001-fix-compile.patch | 24 | ||||
| -rw-r--r-- | package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/package/kernel/lantiq/ltq-vdsl-mei/patches/001-fix-compile.patch b/package/kernel/lantiq/ltq-vdsl-mei/patches/001-fix-compile.patch new file mode 100644 index 0000000000..b19de24730 --- /dev/null +++ b/package/kernel/lantiq/ltq-vdsl-mei/patches/001-fix-compile.patch @@ -0,0 +1,24 @@ +--- a/src/drv_mei_cpe_linux.h ++++ b/src/drv_mei_cpe_linux.h +@@ -31,6 +31,9 @@ + #include <linux/module.h> + + #include <linux/sched.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) ++#include <linux/sched/signal.h> ++#endif + #include <linux/interrupt.h> + #include <linux/version.h> + #include <linux/crc32.h> +@@ -121,7 +124,11 @@ typedef int (*MEI_RequestIrq_WrapLinux_t + /** + Function typedef for the Linux free_irq() + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) ++typedef const void *(*MEI_FreeIrq_WrapLinux_t)( unsigned int usedIrq, ++#else + typedef void (*MEI_FreeIrq_WrapLinux_t)( unsigned int usedIrq, ++#endif + void *usedDevId ); + + diff --git a/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch index 10122fe731..e9584098ee 100644 --- a/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch +++ b/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch @@ -10,7 +10,7 @@ --- a/src/drv_mei_cpe_linux.h +++ b/src/drv_mei_cpe_linux.h -@@ -57,12 +57,6 @@ +@@ -60,12 +60,6 @@ #include <linux/poll.h> #include <linux/types.h> |