modpost error fix

[belegdol]

I had to add one more patch to get the 6.1 kernel to compile on armbian:

Code: Select all

diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
index a193584f9..8d8f31ad3 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
@@ -2490,10 +2490,10 @@ void kbasep_os_process_page_usage_update(struct kbase_context *kctx, int pages)
 	if (mm) {
 		atomic_add(pages, &kctx->nonmapped_pages);
 #ifdef SPLIT_RSS_COUNTING
-		add_mm_counter(mm, MM_FILEPAGES, pages);
+		atomic_long_add(pages, &mm->rss_stat.count[MM_FILEPAGES]);
 #else
 		spin_lock(&mm->page_table_lock);
-		add_mm_counter(mm, MM_FILEPAGES, pages);
+		atomic_long_add(pages, &mm->rss_stat.count[MM_FILEPAGES]);
 		spin_unlock(&mm->page_table_lock);
 #endif
 	}
@@ -2518,10 +2518,10 @@ static void kbasep_os_process_page_usage_drain(struct kbase_context *kctx)
 
 	pages = atomic_xchg(&kctx->nonmapped_pages, 0);
 #ifdef SPLIT_RSS_COUNTING
-	add_mm_counter(mm, MM_FILEPAGES, -pages);
+	atomic_long_add(-pages, &mm->rss_stat.count[MM_FILEPAGES]);
 #else
 	spin_lock(&mm->page_table_lock);
-	add_mm_counter(mm, MM_FILEPAGES, -pages);
+	atomic_long_add(-pages, &mm->rss_stat.count[MM_FILEPAGES]);
 	spin_unlock(&mm->page_table_lock);
 #endif
 }

[mdrjr]

Hello!
Thank you for this patch!

Do you want to send a PR or should I just pick it ?

Btw, what compiler you are using? I build the kernel just fine on Ubuntu 22.04 (gcc 11.2)

[belegdol]

Please feel free to patch it. I got the fix from https://github.com/EasyNetDev/mali-midgard. As for the compiler, I am compiling on Ubuntu 22.04 as well. Maybe armbian kernel config is slightly different which is causing these issues?

[belegdol]

Probably as my defconfig didn't got that error.

Merged. https://github.com/hardkernel/linux/com ... a4d87cd86d