.. | .. |
---|
34 | 34 | |
---|
35 | 35 | #include <linux/kernel.h> |
---|
36 | 36 | #include <linux/serial_8250.h> |
---|
| 37 | +#include <linux/memblock.h> |
---|
37 | 38 | #include <linux/pm.h> |
---|
38 | 39 | |
---|
39 | 40 | #include <asm/idle.h> |
---|
.. | .. |
---|
149 | 150 | |
---|
150 | 151 | bootm = (void *)(long)nlm_prom_info.psb_mem_map; |
---|
151 | 152 | for (i = 0; i < bootm->nr_map; i++) { |
---|
152 | | - if (bootm->map[i].type != BOOT_MEM_RAM) |
---|
| 153 | + if (bootm->map[i].type != NLM_BOOT_MEM_RAM) |
---|
153 | 154 | continue; |
---|
154 | 155 | start = bootm->map[i].addr; |
---|
155 | 156 | size = bootm->map[i].size; |
---|
.. | .. |
---|
158 | 159 | if (i == 0 && start == 0 && size == 0x0c000000) |
---|
159 | 160 | size = 0x0ff00000; |
---|
160 | 161 | |
---|
161 | | - add_memory_region(start, size - pref_backup, BOOT_MEM_RAM); |
---|
| 162 | + memblock_add(start, size - pref_backup); |
---|
162 | 163 | } |
---|
163 | 164 | } |
---|
164 | 165 | |
---|