hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/arch/sparc/kernel/mdesc.c
....@@ -5,13 +5,12 @@
55 */
66 #include <linux/kernel.h>
77 #include <linux/types.h>
8
-#include <linux/memblock.h>
98 #include <linux/log2.h>
109 #include <linux/list.h>
1110 #include <linux/slab.h>
1211 #include <linux/mm.h>
1312 #include <linux/miscdevice.h>
14
-#include <linux/bootmem.h>
13
+#include <linux/memblock.h>
1514 #include <linux/export.h>
1615 #include <linux/refcount.h>
1716
....@@ -171,7 +170,7 @@
171170 mdesc_size);
172171 alloc_size = PAGE_ALIGN(handle_size);
173172
174
- paddr = memblock_alloc(alloc_size, PAGE_SIZE);
173
+ paddr = memblock_phys_alloc(alloc_size, PAGE_SIZE);
175174
176175 hp = NULL;
177176 if (paddr) {
....@@ -191,7 +190,7 @@
191190
192191 alloc_size = PAGE_ALIGN(hp->handle_size);
193192 start = __pa(hp);
194
- free_bootmem_late(start, alloc_size);
193
+ memblock_free_late(start, alloc_size);
195194 }
196195
197196 static struct mdesc_mem_ops memblock_mdesc_ops = {