kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arc/include/asm/highmem.h
..
..
@@ -9,29 +9,17 @@
9
9
 #ifdef CONFIG_HIGHMEM
10
10
 
11
11
 #include <uapi/asm/page.h>
12
-#include <asm/kmap_size.h>
13
-
14
-#define FIXMAP_SIZE		PGDIR_SIZE
15
-#define PKMAP_SIZE		PGDIR_SIZE
12
+#include <asm/kmap_types.h>
16
13
 
17
14
 /* start after vmalloc area */
18
15
 #define FIXMAP_BASE		(PAGE_OFFSET - FIXMAP_SIZE - PKMAP_SIZE)
19
-
20
-#define FIX_KMAP_SLOTS		(KM_MAX_IDX * NR_CPUS)
21
-#define FIX_KMAP_BEGIN		(0UL)
22
-#define FIX_KMAP_END		((FIX_KMAP_BEGIN + FIX_KMAP_SLOTS) - 1)
23
-
24
-#define FIXADDR_TOP		(FIXMAP_BASE + (FIX_KMAP_END << PAGE_SHIFT))
25
-
26
-/*
27
- * This should be converted to the asm-generic version, but of course this
28
- * is needlessly different from all other architectures. Sigh - tglx
29
- */
30
-#define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
31
-#define __virt_to_fix(x)	(((FIXADDR_TOP - ((x) & PAGE_MASK))) >> PAGE_SHIFT)
16
+#define FIXMAP_SIZE		PGDIR_SIZE	/* only 1 PGD worth */
17
+#define KM_TYPE_NR		((FIXMAP_SIZE >> PAGE_SHIFT)/NR_CPUS)
18
+#define FIXMAP_ADDR(nr)		(FIXMAP_BASE + ((nr) << PAGE_SHIFT))
32
19
 
33
20
 /* start after fixmap area */
34
21
 #define PKMAP_BASE		(FIXMAP_BASE + FIXMAP_SIZE)
22
+#define PKMAP_SIZE		PGDIR_SIZE
35
23
 #define LAST_PKMAP		(PKMAP_SIZE >> PAGE_SHIFT)
36
24
 #define LAST_PKMAP_MASK		(LAST_PKMAP - 1)
37
25
 #define PKMAP_ADDR(nr)		(PKMAP_BASE + ((nr) << PAGE_SHIFT))
..
..
@@ -41,13 +29,11 @@
41
29
 
42
30
 extern void kmap_init(void);
43
31
 
44
-#define arch_kmap_local_post_unmap(vaddr)			\
45
-	local_flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE)
46
-
47
32
 static inline void flush_cache_kmaps(void)
48
33
 {
49
34
 	flush_cache_all();
50
35
 }
36
+
51
37
 #endif
52
38
 
53
39
 #endif