hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/alpha/kernel/core_marvel.c
....@@ -18,12 +18,11 @@
1818 #include <linux/mc146818rtc.h>
1919 #include <linux/rtc.h>
2020 #include <linux/module.h>
21
-#include <linux/bootmem.h>
21
+#include <linux/memblock.h>
2222
2323 #include <asm/ptrace.h>
2424 #include <asm/smp.h>
2525 #include <asm/gct.h>
26
-#include <asm/pgalloc.h>
2726 #include <asm/tlbflush.h>
2827 #include <asm/vga.h>
2928
....@@ -82,7 +81,10 @@
8281 char *name;
8382
8483 sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port);
85
- name = alloc_bootmem(strlen(tmp) + 1);
84
+ name = memblock_alloc(strlen(tmp) + 1, SMP_CACHE_BYTES);
85
+ if (!name)
86
+ panic("%s: Failed to allocate %zu bytes\n", __func__,
87
+ strlen(tmp) + 1);
8688 strcpy(name, tmp);
8789
8890 return name;
....@@ -117,7 +119,10 @@
117119 return NULL;
118120 }
119121
120
- io7 = alloc_bootmem(sizeof(*io7));
122
+ io7 = memblock_alloc(sizeof(*io7), SMP_CACHE_BYTES);
123
+ if (!io7)
124
+ panic("%s: Failed to allocate %zu bytes\n", __func__,
125
+ sizeof(*io7));
121126 io7->pe = pe;
122127 raw_spin_lock_init(&io7->irq_lock);
123128
....@@ -801,7 +806,7 @@
801806 }
802807
803808 unsigned int
804
-marvel_ioread8(void __iomem *xaddr)
809
+marvel_ioread8(const void __iomem *xaddr)
805810 {
806811 unsigned long addr = (unsigned long) xaddr;
807812 if (__marvel_is_port_kbd(addr))