add REDIRECT

hc

2024-10-09 05e59e5fb0064c97a1c10921ecd549f2d4a58565

 kernel/arch/nds32/mm/highmem.c
..
..
@@ -6,49 +6,22 @@
6
6
 #include <linux/sched.h>
7
7
 #include <linux/smp.h>
8
8
 #include <linux/interrupt.h>
9
-#include <linux/bootmem.h>
9
+#include <linux/memblock.h>
10
10
 #include <asm/fixmap.h>
11
11
 #include <asm/tlbflush.h>
12
12
 
13
-void *kmap(struct page *page)
14
-{
15
-	unsigned long vaddr;
16
-	might_sleep();
17
-	if (!PageHighMem(page))
18
-		return page_address(page);
19
-	vaddr = (unsigned long)kmap_high(page);
20
-	return (void *)vaddr;
21
-}
22
-
23
-EXPORT_SYMBOL(kmap);
24
-
25
-void kunmap(struct page *page)
26
-{
27
-	BUG_ON(in_interrupt());
28
-	if (!PageHighMem(page))
29
-		return;
30
-	kunmap_high(page);
31
-}
32
-
33
-EXPORT_SYMBOL(kunmap);
34
-
35
-void *kmap_atomic(struct page *page)
13
+void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)
36
14
 {
37
15
 	unsigned int idx;
38
16
 	unsigned long vaddr, pte;
39
17
 	int type;
40
18
 	pte_t *ptep;
41
19
 
42
-	preempt_disable();
43
-	pagefault_disable();
44
-	if (!PageHighMem(page))
45
-		return page_address(page);
46
-
47
20
 	type = kmap_atomic_idx_push();
48
21
 
49
22
 	idx = type + KM_TYPE_NR * smp_processor_id();
50
23
 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
51
-	pte = (page_to_pfn(page) << PAGE_SHIFT) | (PAGE_KERNEL);
24
+	pte = (page_to_pfn(page) << PAGE_SHIFT) | prot;
52
25
 	ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
53
26
 	set_pte(ptep, pte);
54
27
 
..
..
@@ -58,10 +31,9 @@
58
31
 	__nds32__isb();
59
32
 	return (void *)vaddr;
60
33
 }
34
+EXPORT_SYMBOL(kmap_atomic_high_prot);
61
35
 
62
-EXPORT_SYMBOL(kmap_atomic);
63
-
64
-void __kunmap_atomic(void *kvaddr)
36
+void kunmap_atomic_high(void *kvaddr)
65
37
 {
66
38
 	if (kvaddr >= (void *)FIXADDR_START) {
67
39
 		unsigned long vaddr = (unsigned long)kvaddr;
..
..
@@ -72,8 +44,5 @@
72
44
 		ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);
73
45
 		set_pte(ptep, 0);
74
46
 	}
75
-	pagefault_enable();
76
-	preempt_enable();
77
47
 }
78
-
79
-EXPORT_SYMBOL(__kunmap_atomic);
48
+EXPORT_SYMBOL(kunmap_atomic_high);