update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm/mm/mm.h
..
..
@@ -2,11 +2,12 @@
2
2
 #ifdef CONFIG_MMU
3
3
 #include <linux/list.h>
4
4
 #include <linux/vmalloc.h>
5
-
6
-#include <asm/pgtable.h>
5
+#include <linux/pgtable.h>
7
6
 
8
7
 /* the upper-most page table pointer */
9
8
 extern pmd_t *top_pmd;
9
+
10
+extern int icache_size;
10
11
 
11
12
 /*
12
13
  * 0xffff8000 to 0xffffffff is reserved for any ARM architecture
..
..
@@ -32,11 +33,6 @@
32
33
 {
33
34
 	pte_t *ptep = pte_offset_kernel(top_pmd, va);
34
35
 	return *ptep;
35
-}
36
-
37
-static inline pmd_t *pmd_off_k(unsigned long virt)
38
-{
39
-	return pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
40
36
 }
41
37
 
42
38
 struct mem_type {
..
..
@@ -67,9 +63,6 @@
67
63
 /* mapping type (attributes) for permanent static mappings */
68
64
 #define VM_ARM_MTYPE(mt)		((mt) << 20)
69
65
 #define VM_ARM_MTYPE_MASK	(0x1f << 20)
70
-
71
-/* consistent regions used by dma_alloc_attrs() */
72
-#define VM_ARM_DMA_CONSISTENT	0x20000000
73
66
 
74
67
 
75
68
 struct static_vm {