[openwrt/openwrt] lantiq: ltq-vdsl: add kernel 5.10 compatiblity
LEDE Commits
lede-commits at lists.infradead.org
Mon Apr 12 22:23:26 BST 2021
mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e32d10e176de9d0de61f61953c4e46453f30829c
commit e32d10e176de9d0de61f61953c4e46453f30829c
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sun Dec 27 21:03:14 2020 +0100
lantiq: ltq-vdsl: add kernel 5.10 compatiblity
The pgprot argument to __vmalloc is always PAGE_KERNEL now and was
removed.
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
.../kernel/lantiq/ltq-vdsl/patches/100-compat.patch | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
index 28d1da7c33..edacd5f6b8 100644
--- a/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
+++ b/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
@@ -35,7 +35,19 @@
#endif
if (pINode == DSL_NULL)
-@@ -917,12 +911,19 @@ DSL_int32_t DSL_DRV_ThreadShutdown(
+@@ -491,7 +485,11 @@ DSL_void_t* DSL_DRV_VMalloc(
+ DSL_DRV_size_t nSize)
+ {
+ /* VRX500-BU: Better to use vmalloc or vzmalloc here?! */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0)
+ return __vmalloc((unsigned long)nSize, GFP_KERNEL, PAGE_KERNEL);
++#else
++ return __vmalloc((unsigned long)nSize, GFP_KERNEL);
++#endif
+ /* return vmalloc(nSize);*/
+ }
+
+@@ -917,12 +915,19 @@ DSL_int32_t DSL_DRV_ThreadShutdown(
DSL_uint32_t DSL_DRV_SysTimeGet(DSL_uint32_t nOffset)
{
@@ -56,7 +68,7 @@
if ( (nOffset == 0) || (nOffset > nTime) )
{
-@@ -1203,6 +1204,9 @@ static void DSL_DRV_NlSendMsg(DSL_char_t
+@@ -1203,6 +1208,9 @@ static void DSL_DRV_NlSendMsg(DSL_char_t
}
#endif
@@ -66,7 +78,7 @@
/* Entry point of driver */
int __init DSL_ModuleInit(void)
{
-@@ -1241,6 +1245,10 @@ int __init DSL_ModuleInit(void)
+@@ -1241,6 +1249,10 @@ int __init DSL_ModuleInit(void)
DSL_DRV_DevNodeInit();
@@ -77,7 +89,7 @@
return 0;
}
-@@ -1248,6 +1256,11 @@ void __exit DSL_ModuleCleanup(void)
+@@ -1248,6 +1260,11 @@ void __exit DSL_ModuleCleanup(void)
{
printk("Module will be unloaded"DSL_DRV_CRLF);
More information about the lede-commits
mailing list