hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/arch/m68k/atari/stram.c
....@@ -17,7 +17,7 @@
1717 #include <linux/slab.h>
1818 #include <linux/vmalloc.h>
1919 #include <linux/pagemap.h>
20
-#include <linux/bootmem.h>
20
+#include <linux/memblock.h>
2121 #include <linux/mount.h>
2222 #include <linux/blkdev.h>
2323 #include <linux/module.h>
....@@ -26,7 +26,6 @@
2626 #include <asm/setup.h>
2727 #include <asm/machdep.h>
2828 #include <asm/page.h>
29
-#include <asm/pgtable.h>
3029 #include <asm/atarihw.h>
3130 #include <asm/atari_stram.h>
3231 #include <asm/io.h>
....@@ -95,7 +94,12 @@
9594 {
9695 if (kernel_in_stram) {
9796 pr_debug("atari_stram pool: kernel in ST-RAM, using alloc_bootmem!\n");
98
- stram_pool.start = (resource_size_t)alloc_bootmem_low_pages(pool_size);
97
+ stram_pool.start = (resource_size_t)memblock_alloc_low(pool_size,
98
+ PAGE_SIZE);
99
+ if (!stram_pool.start)
100
+ panic("%s: Failed to allocate %lu bytes align=%lx\n",
101
+ __func__, pool_size, PAGE_SIZE);
102
+
99103 stram_pool.end = stram_pool.start + pool_size - 1;
100104 request_resource(&iomem_resource, &stram_pool);
101105 stram_virt_offset = 0;