kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/sparc/include/asm/highmem.h
..
..
@@ -22,14 +22,15 @@
22
22
 #ifdef __KERNEL__
23
23
 
24
24
 #include <linux/interrupt.h>
25
+#include <linux/pgtable.h>
25
26
 #include <asm/vaddrs.h>
26
27
 #include <asm/kmap_types.h>
27
-#include <asm/pgtable.h>
28
+#include <asm/pgtsrmmu.h>
28
29
 
29
30
 /* declarations for highmem.c */
30
31
 extern unsigned long highstart_pfn, highend_pfn;
31
32
 
32
-extern pgprot_t kmap_prot;
33
+#define kmap_prot __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE)
33
34
 extern pte_t *pkmap_page_table;
34
35
 
35
36
 void kmap_init(void) __init;
..
..
@@ -49,28 +50,6 @@
49
50
 #define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
50
51
 
51
52
 #define PKMAP_END (PKMAP_ADDR(LAST_PKMAP))
52
-
53
-void *kmap_high(struct page *page);
54
-void kunmap_high(struct page *page);
55
-
56
-static inline void *kmap(struct page *page)
57
-{
58
-	BUG_ON(in_interrupt());
59
-	if (!PageHighMem(page))
60
-		return page_address(page);
61
-	return kmap_high(page);
62
-}
63
-
64
-static inline void kunmap(struct page *page)
65
-{
66
-	BUG_ON(in_interrupt());
67
-	if (!PageHighMem(page))
68
-		return;
69
-	kunmap_high(page);
70
-}
71
-
72
-void *kmap_atomic(struct page *page);
73
-void __kunmap_atomic(void *kvaddr);
74
53
 
75
54
 #define flush_cache_kmaps()	flush_cache_all()
76
55