移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/arch/arm/include/asm/highmem.h
..
..
@@ -2,15 +2,14 @@
2
2
 #ifndef _ASM_HIGHMEM_H
3
3
 #define _ASM_HIGHMEM_H
4
4
 
5
-#include <asm/kmap_types.h>
5
+#include <asm/kmap_size.h>
6
+#include <asm/fixmap.h>
6
7
 
7
8
 #define PKMAP_BASE		(PAGE_OFFSET - PMD_SIZE)
8
9
 #define LAST_PKMAP		PTRS_PER_PTE
9
10
 #define LAST_PKMAP_MASK		(LAST_PKMAP - 1)
10
11
 #define PKMAP_NR(virt)		(((virt) - PKMAP_BASE) >> PAGE_SHIFT)
11
12
 #define PKMAP_ADDR(nr)		(PKMAP_BASE + ((nr) << PAGE_SHIFT))
12
-
13
-#define kmap_prot		PAGE_KERNEL
14
13
 
15
14
 #define flush_cache_kmaps() \
16
15
 	do { \
..
..
@@ -19,9 +18,6 @@
19
18
 	} while (0)
20
19
 
21
20
 extern pte_t *pkmap_page_table;
22
-
23
-extern void *kmap_high(struct page *page);
24
-extern void kunmap_high(struct page *page);
25
21
 
26
22
 /*
27
23
  * The reason for kmap_high_get() is to ensure that the currently kmap'd
..
..
@@ -51,23 +47,32 @@
51
47
 
52
48
 #ifdef ARCH_NEEDS_KMAP_HIGH_GET
53
49
 extern void *kmap_high_get(struct page *page);
54
-#else
50
+
51
+static inline void *arch_kmap_local_high_get(struct page *page)
52
+{
53
+	if (IS_ENABLED(CONFIG_DEBUG_HIGHMEM) && !cache_is_vivt())
54
+		return NULL;
55
+	return kmap_high_get(page);
56
+}
57
+#define arch_kmap_local_high_get arch_kmap_local_high_get
58
+
59
+#else /* ARCH_NEEDS_KMAP_HIGH_GET */
55
60
 static inline void *kmap_high_get(struct page *page)
56
61
 {
57
62
 	return NULL;
58
63
 }
59
-#endif
64
+#endif /* !ARCH_NEEDS_KMAP_HIGH_GET */
60
65
 
61
-/*
62
- * The following functions are already defined by <linux/highmem.h>
63
- * when CONFIG_HIGHMEM is not set.
64
- */
65
-#ifdef CONFIG_HIGHMEM
66
-extern void *kmap(struct page *page);
67
-extern void kunmap(struct page *page);
68
-extern void *kmap_atomic(struct page *page);
69
-extern void __kunmap_atomic(void *kvaddr);
70
-extern void *kmap_atomic_pfn(unsigned long pfn);
71
-#endif
66
+#define arch_kmap_local_post_map(vaddr, pteval)				\
67
+	local_flush_tlb_kernel_page(vaddr)
68
+
69
+#define arch_kmap_local_pre_unmap(vaddr)				\
70
+do {									\
71
+	if (cache_is_vivt())						\
72
+		__cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);	\
73
+} while (0)
74
+
75
+#define arch_kmap_local_post_unmap(vaddr)				\
76
+	local_flush_tlb_kernel_page(vaddr)
72
77
 
73
78
 #endif