diff options
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 272734681d29..e769401a78ba 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
33 | #include <linux/lmb.h> | 33 | #include <linux/memblock.h> |
34 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
35 | #include <asm/io.h> | 35 | #include <asm/io.h> |
36 | #include <asm/page.h> | 36 | #include <asm/page.h> |
@@ -141,10 +141,10 @@ void __init check_for_initrd(void) | |||
141 | goto disable; | 141 | goto disable; |
142 | } | 142 | } |
143 | 143 | ||
144 | if (unlikely(end > lmb_end_of_DRAM())) { | 144 | if (unlikely(end > memblock_end_of_DRAM())) { |
145 | pr_err("initrd extends beyond end of memory " | 145 | pr_err("initrd extends beyond end of memory " |
146 | "(0x%08lx > 0x%08lx)\ndisabling initrd\n", | 146 | "(0x%08lx > 0x%08lx)\ndisabling initrd\n", |
147 | end, (unsigned long)lmb_end_of_DRAM()); | 147 | end, (unsigned long)memblock_end_of_DRAM()); |
148 | goto disable; | 148 | goto disable; |
149 | } | 149 | } |
150 | 150 | ||
@@ -161,7 +161,7 @@ void __init check_for_initrd(void) | |||
161 | initrd_start = (unsigned long)__va(__pa(start)); | 161 | initrd_start = (unsigned long)__va(__pa(start)); |
162 | initrd_end = initrd_start + INITRD_SIZE; | 162 | initrd_end = initrd_start + INITRD_SIZE; |
163 | 163 | ||
164 | lmb_reserve(__pa(initrd_start), INITRD_SIZE); | 164 | memblock_reserve(__pa(initrd_start), INITRD_SIZE); |
165 | 165 | ||
166 | return; | 166 | return; |
167 | 167 | ||