.. | .. |
---|
17 | 17 | #include <linux/slab.h> |
---|
18 | 18 | #include <linux/vmalloc.h> |
---|
19 | 19 | #include <linux/pagemap.h> |
---|
20 | | -#include <linux/bootmem.h> |
---|
| 20 | +#include <linux/memblock.h> |
---|
21 | 21 | #include <linux/mount.h> |
---|
22 | 22 | #include <linux/blkdev.h> |
---|
23 | 23 | #include <linux/module.h> |
---|
.. | .. |
---|
26 | 26 | #include <asm/setup.h> |
---|
27 | 27 | #include <asm/machdep.h> |
---|
28 | 28 | #include <asm/page.h> |
---|
29 | | -#include <asm/pgtable.h> |
---|
30 | 29 | #include <asm/atarihw.h> |
---|
31 | 30 | #include <asm/atari_stram.h> |
---|
32 | 31 | #include <asm/io.h> |
---|
.. | .. |
---|
95 | 94 | { |
---|
96 | 95 | if (kernel_in_stram) { |
---|
97 | 96 | 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 | + |
---|
99 | 103 | stram_pool.end = stram_pool.start + pool_size - 1; |
---|
100 | 104 | request_resource(&iomem_resource, &stram_pool); |
---|
101 | 105 | stram_virt_offset = 0; |
---|