diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/atari/stram.c | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/setup.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index 8dda6515887a..0055a6c06f75 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c | |||
@@ -154,7 +154,7 @@ void __init atari_stram_reserve_pages(void *start_mem) | |||
154 | /* always reserve first page of ST-RAM, the first 2 kB are | 154 | /* always reserve first page of ST-RAM, the first 2 kB are |
155 | * supervisor-only! */ | 155 | * supervisor-only! */ |
156 | if (!kernel_in_stram) | 156 | if (!kernel_in_stram) |
157 | reserve_bootmem (0, PAGE_SIZE); | 157 | reserve_bootmem(0, PAGE_SIZE, BOOTMEM_DEFAULT); |
158 | 158 | ||
159 | } | 159 | } |
160 | 160 | ||
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index ed3a4caec620..9a06c48edcb3 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
@@ -323,7 +323,8 @@ void __init setup_arch(char **cmdline_p) | |||
323 | #ifdef CONFIG_BLK_DEV_INITRD | 323 | #ifdef CONFIG_BLK_DEV_INITRD |
324 | if (m68k_ramdisk.size) { | 324 | if (m68k_ramdisk.size) { |
325 | reserve_bootmem_node(__virt_to_node(phys_to_virt(m68k_ramdisk.addr)), | 325 | reserve_bootmem_node(__virt_to_node(phys_to_virt(m68k_ramdisk.addr)), |
326 | m68k_ramdisk.addr, m68k_ramdisk.size); | 326 | m68k_ramdisk.addr, m68k_ramdisk.size, |
327 | BOOTMEM_DEFAULT); | ||
327 | initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr); | 328 | initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr); |
328 | initrd_end = initrd_start + m68k_ramdisk.size; | 329 | initrd_end = initrd_start + m68k_ramdisk.size; |
329 | printk("initrd: %08lx - %08lx\n", initrd_start, initrd_end); | 330 | printk("initrd: %08lx - %08lx\n", initrd_start, initrd_end); |