update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/mips/mm/cache.c
..
..
@@ -14,9 +14,9 @@
14
14
 #include <linux/sched.h>
15
15
 #include <linux/syscalls.h>
16
16
 #include <linux/mm.h>
17
+#include <linux/highmem.h>
17
18
 
18
19
 #include <asm/cacheflush.h>
19
-#include <asm/highmem.h>
20
20
 #include <asm/processor.h>
21
21
 #include <asm/cpu.h>
22
22
 #include <asm/cpu-features.h>
..
..
@@ -36,7 +36,6 @@
36
36
 void (*local_flush_icache_range)(unsigned long start, unsigned long end);
37
37
 EXPORT_SYMBOL_GPL(local_flush_icache_range);
38
38
 void (*__flush_icache_user_range)(unsigned long start, unsigned long end);
39
-EXPORT_SYMBOL_GPL(__flush_icache_user_range);
40
39
 void (*__local_flush_icache_user_range)(unsigned long start, unsigned long end);
41
40
 EXPORT_SYMBOL_GPL(__local_flush_icache_user_range);
42
41
 
..
..
@@ -47,7 +46,6 @@
47
46
 EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
48
47
 
49
48
 /* MIPS specific cache operations */
50
-void (*flush_cache_sigtramp)(unsigned long addr);
51
49
 void (*local_flush_data_cache_page)(void * addr);
52
50
 void (*flush_data_cache_page)(unsigned long addr);
53
51
 void (*flush_icache_all)(void);
..
..
@@ -63,8 +61,6 @@
63
61
 void (*_dma_cache_wback)(unsigned long start, unsigned long size);
64
62
 void (*_dma_cache_inv)(unsigned long start, unsigned long size);
65
63
 
66
-EXPORT_SYMBOL(_dma_cache_wback_inv);
67
-
68
64
 #endif /* CONFIG_DMA_NONCOHERENT */
69
65
 
70
66
 /*
..
..
@@ -76,7 +72,7 @@
76
72
 {
77
73
 	if (bytes == 0)
78
74
 		return 0;
79
-	if (!access_ok(VERIFY_WRITE, (void __user *) addr, bytes))
75
+	if (!access_ok((void __user *) addr, bytes))
80
76
 		return -EFAULT;
81
77
 
82
78
 	__flush_icache_user_range(addr, addr + bytes);
..
..
@@ -107,7 +103,7 @@
107
103
 	flush_data_cache_page(addr);
108
104
 
109
105
 	if (PageHighMem(page))
110
-		__kunmap_atomic((void *)addr);
106
+		kunmap_atomic((void *)addr);
111
107
 }
112
108
 
113
109
 EXPORT_SYMBOL(__flush_dcache_page);
..
..
@@ -150,7 +146,7 @@
150
146
 			flush_data_cache_page(addr);
151
147
 
152
148
 		if (PageHighMem(page))
153
-			__kunmap_atomic((void *)addr);
149
+			kunmap_atomic((void *)addr);
154
150
 
155
151
 		ClearPageDcacheDirty(page);
156
152
 	}