.. | .. |
---|
27 | 27 | #include <linux/init.h> |
---|
28 | 28 | #include <linux/types.h> |
---|
29 | 29 | #include <linux/kernel.h> |
---|
| 30 | +#include <linux/memblock.h> |
---|
30 | 31 | #include <linux/spinlock.h> |
---|
31 | 32 | #include <linux/ssb/ssb_driver_chipcommon.h> |
---|
32 | 33 | #include <linux/ssb/ssb_regs.h> |
---|
.. | .. |
---|
85 | 86 | pr_debug("Assume 128MB RAM\n"); |
---|
86 | 87 | break; |
---|
87 | 88 | } |
---|
88 | | - if (!memcmp(prom_init, prom_init + mem, 32)) |
---|
| 89 | + if (!memcmp((void *)prom_init, (void *)prom_init + mem, 32)) |
---|
89 | 90 | break; |
---|
90 | 91 | } |
---|
91 | 92 | lowmem = mem; |
---|
.. | .. |
---|
97 | 98 | */ |
---|
98 | 99 | if (c->cputype == CPU_74K && (mem == (128 << 20))) |
---|
99 | 100 | mem -= 0x1000; |
---|
100 | | - add_memory_region(0, mem, BOOT_MEM_RAM); |
---|
| 101 | + memblock_add(0, mem); |
---|
101 | 102 | } |
---|
102 | 103 | |
---|
103 | 104 | /* |
---|
.. | .. |
---|
162 | 163 | |
---|
163 | 164 | off = EXTVBASE + __pa(off); |
---|
164 | 165 | for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) { |
---|
165 | | - if (!memcmp(prom_init, (void *)(off + extmem), 16)) |
---|
| 166 | + if (!memcmp((void *)prom_init, (void *)(off + extmem), 16)) |
---|
166 | 167 | break; |
---|
167 | 168 | } |
---|
168 | 169 | extmem -= lowmem; |
---|