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@kresin.me>
This commit is contained in:
Mathias Kresin 2020-12-27 21:03:14 +01:00
parent 804c541446
commit e32d10e176

View File

@ -35,7 +35,19 @@
#endif #endif
if (pINode == DSL_NULL) 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) DSL_uint32_t DSL_DRV_SysTimeGet(DSL_uint32_t nOffset)
{ {
@ -56,7 +68,7 @@
if ( (nOffset == 0) || (nOffset > nTime) ) 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 #endif
@ -66,7 +78,7 @@
/* Entry point of driver */ /* Entry point of driver */
int __init DSL_ModuleInit(void) 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(); DSL_DRV_DevNodeInit();
@ -77,7 +89,7 @@
return 0; 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); printk("Module will be unloaded"DSL_DRV_CRLF);