add new system file

hc

2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c

 kernel/arch/nios2/mm/ioremap.c
..
..
@@ -86,11 +86,15 @@
86
86
 	if (address >= end)
87
87
 		BUG();
88
88
 	do {
89
+		p4d_t *p4d;
89
90
 		pud_t *pud;
90
91
 		pmd_t *pmd;
91
92
 
92
93
 		error = -ENOMEM;
93
-		pud = pud_alloc(&init_mm, dir, address);
94
+		p4d = p4d_alloc(&init_mm, dir, address);
95
+		if (!p4d)
96
+			break;
97
+		pud = pud_alloc(&init_mm, p4d, address);
94
98
 		if (!pud)
95
99
 			break;
96
100
 		pmd = pmd_alloc(&init_mm, pud, address);
..
..
@@ -112,8 +116,7 @@
112
116
 /*
113
117
  * Map some physical address range into the kernel address space.
114
118
  */
115
-void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
116
-			unsigned long cacheflag)
119
+void __iomem *ioremap(unsigned long phys_addr, unsigned long size)
117
120
 {
118
121
 	struct vm_struct *area;
119
122
 	unsigned long offset;
..
..
@@ -144,8 +147,7 @@
144
147
 	 * CONFIG_NIOS2_IO_REGION_BASE
145
148
 	 */
146
149
 	if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&
147
-	    IS_MAPPABLE_UNCACHEABLE(last_addr) &&
148
-	    !(cacheflag & _PAGE_CACHED))
150
+	    IS_MAPPABLE_UNCACHEABLE(last_addr))
149
151
 		return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);
150
152
 
151
153
 	/* Mappings have to be page-aligned */
..
..
@@ -158,21 +160,20 @@
158
160
 	if (!area)
159
161
 		return NULL;
160
162
 	addr = area->addr;
161
-	if (remap_area_pages((unsigned long) addr, phys_addr, size,
162
-		cacheflag)) {
163
+	if (remap_area_pages((unsigned long) addr, phys_addr, size, 0)) {
163
164
 		vunmap(addr);
164
165
 		return NULL;
165
166
 	}
166
167
 	return (void __iomem *) (offset + (char *)addr);
167
168
 }
168
-EXPORT_SYMBOL(__ioremap);
169
+EXPORT_SYMBOL(ioremap);
169
170
 
170
171
 /*
171
- * __iounmap unmaps nearly everything, so be careful
172
+ * iounmap unmaps nearly everything, so be careful
172
173
  * it doesn't free currently pointer/page tables anymore but it
173
174
  * wasn't used anyway and might be added later.
174
175
  */
175
-void __iounmap(void __iomem *addr)
176
+void iounmap(void __iomem *addr)
176
177
 {
177
178
 	struct vm_struct *p;
178
179
 
..
..
@@ -184,4 +185,4 @@
184
185
 		pr_err("iounmap: bad address %p\n", addr);
185
186
 	kfree(p);
186
187
 }
187
-EXPORT_SYMBOL(__iounmap);
188
+EXPORT_SYMBOL(iounmap);