mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/parisc/mm/ioremap.c
..
..
@@ -11,7 +11,7 @@
11
11
 #include <linux/errno.h>
12
12
 #include <linux/module.h>
13
13
 #include <linux/io.h>
14
-#include <asm/pgalloc.h>
14
+#include <linux/mm.h>
15
15
 
16
16
 /*
17
17
  * Generic mapping function (not visible outside):
..
..
@@ -25,7 +25,7 @@
25
25
  * have to convert them into an offset in a page-aligned mapping, but the
26
26
  * caller shouldn't need to know that small detail.
27
27
  */
28
-void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
28
+void __iomem *ioremap(unsigned long phys_addr, unsigned long size)
29
29
 {
30
30
 	void __iomem *addr;
31
31
 	struct vm_struct *area;
..
..
@@ -36,10 +36,8 @@
36
36
 	unsigned long end = phys_addr + size - 1;
37
37
 	/* Support EISA addresses */
38
38
 	if ((phys_addr >= 0x00080000 && end < 0x000fffff) ||
39
-	    (phys_addr >= 0x00500000 && end < 0x03bfffff)) {
39
+	    (phys_addr >= 0x00500000 && end < 0x03bfffff))
40
40
 		phys_addr |= F_EXTEND(0xfc000000);
41
-		flags |= _PAGE_NO_CACHE;
42
-	}
43
41
 #endif
44
42
 
45
43
 	/* Don't allow wraparound or zero size */
..
..
@@ -65,7 +63,7 @@
65
63
 	}
66
64
 
67
65
 	pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY |
68
-			  _PAGE_ACCESSED | flags);
66
+			  _PAGE_ACCESSED | _PAGE_NO_CACHE);
69
67
 
70
68
 	/*
71
69
 	 * Mappings have to be page-aligned
..
..
@@ -90,7 +88,7 @@
90
88
 
91
89
 	return (void __iomem *) (offset + (char __iomem *)addr);
92
90
 }
93
-EXPORT_SYMBOL(__ioremap);
91
+EXPORT_SYMBOL(ioremap);
94
92
 
95
93
 void iounmap(const volatile void __iomem *io_addr)
96
94
 {