.. | .. |
---|
18 | 18 | #include <linux/mc146818rtc.h> |
---|
19 | 19 | #include <linux/rtc.h> |
---|
20 | 20 | #include <linux/module.h> |
---|
21 | | -#include <linux/bootmem.h> |
---|
| 21 | +#include <linux/memblock.h> |
---|
22 | 22 | |
---|
23 | 23 | #include <asm/ptrace.h> |
---|
24 | 24 | #include <asm/smp.h> |
---|
25 | 25 | #include <asm/gct.h> |
---|
26 | | -#include <asm/pgalloc.h> |
---|
27 | 26 | #include <asm/tlbflush.h> |
---|
28 | 27 | #include <asm/vga.h> |
---|
29 | 28 | |
---|
.. | .. |
---|
82 | 81 | char *name; |
---|
83 | 82 | |
---|
84 | 83 | 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); |
---|
86 | 88 | strcpy(name, tmp); |
---|
87 | 89 | |
---|
88 | 90 | return name; |
---|
.. | .. |
---|
117 | 119 | return NULL; |
---|
118 | 120 | } |
---|
119 | 121 | |
---|
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)); |
---|
121 | 126 | io7->pe = pe; |
---|
122 | 127 | raw_spin_lock_init(&io7->irq_lock); |
---|
123 | 128 | |
---|
.. | .. |
---|
801 | 806 | } |
---|
802 | 807 | |
---|
803 | 808 | unsigned int |
---|
804 | | -marvel_ioread8(void __iomem *xaddr) |
---|
| 809 | +marvel_ioread8(const void __iomem *xaddr) |
---|
805 | 810 | { |
---|
806 | 811 | unsigned long addr = (unsigned long) xaddr; |
---|
807 | 812 | if (__marvel_is_port_kbd(addr)) |
---|