hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/mips/bcm47xx/prom.c
....@@ -27,6 +27,7 @@
2727 #include <linux/init.h>
2828 #include <linux/types.h>
2929 #include <linux/kernel.h>
30
+#include <linux/memblock.h>
3031 #include <linux/spinlock.h>
3132 #include <linux/ssb/ssb_driver_chipcommon.h>
3233 #include <linux/ssb/ssb_regs.h>
....@@ -85,7 +86,7 @@
8586 pr_debug("Assume 128MB RAM\n");
8687 break;
8788 }
88
- if (!memcmp(prom_init, prom_init + mem, 32))
89
+ if (!memcmp((void *)prom_init, (void *)prom_init + mem, 32))
8990 break;
9091 }
9192 lowmem = mem;
....@@ -97,7 +98,7 @@
9798 */
9899 if (c->cputype == CPU_74K && (mem == (128 << 20)))
99100 mem -= 0x1000;
100
- add_memory_region(0, mem, BOOT_MEM_RAM);
101
+ memblock_add(0, mem);
101102 }
102103
103104 /*
....@@ -162,7 +163,7 @@
162163
163164 off = EXTVBASE + __pa(off);
164165 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))
166167 break;
167168 }
168169 extmem -= lowmem;