diff options
Diffstat (limited to 'arch/v850/kernel/setup.c')
-rw-r--r-- | arch/v850/kernel/setup.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/v850/kernel/setup.c b/arch/v850/kernel/setup.c index a914f244f494..a0a8456a8430 100644 --- a/arch/v850/kernel/setup.c +++ b/arch/v850/kernel/setup.c | |||
@@ -241,15 +241,18 @@ init_bootmem_alloc (unsigned long ram_start, unsigned long ram_len) | |||
241 | if (kram_end > kram_start) | 241 | if (kram_end > kram_start) |
242 | /* Reserve the RAM part of the kernel's address space, so it | 242 | /* Reserve the RAM part of the kernel's address space, so it |
243 | doesn't get allocated. */ | 243 | doesn't get allocated. */ |
244 | reserve_bootmem (kram_start, kram_end - kram_start); | 244 | reserve_bootmem(kram_start, kram_end - kram_start, |
245 | BOOTMEM_DEFAULT); | ||
245 | 246 | ||
246 | if (intv_in_ram && !intv_in_kram) | 247 | if (intv_in_ram && !intv_in_kram) |
247 | /* Reserve the interrupt vector space. */ | 248 | /* Reserve the interrupt vector space. */ |
248 | reserve_bootmem (intv_start, intv_end - intv_start); | 249 | reserve_bootmem(intv_start, intv_end - intv_start, |
250 | BOOTMEM_DEFAULT); | ||
249 | 251 | ||
250 | if (bootmap >= ram_start && bootmap < ram_end) | 252 | if (bootmap >= ram_start && bootmap < ram_end) |
251 | /* Reserve the bootmap space. */ | 253 | /* Reserve the bootmap space. */ |
252 | reserve_bootmem (bootmap, bootmap_len); | 254 | reserve_bootmem(bootmap, bootmap_len, |
255 | BOOTMEM_DEFAULT); | ||
253 | 256 | ||
254 | /* Reserve the memory used by the root filesystem image if it's | 257 | /* Reserve the memory used by the root filesystem image if it's |
255 | in RAM. */ | 258 | in RAM. */ |
@@ -257,7 +260,8 @@ init_bootmem_alloc (unsigned long ram_start, unsigned long ram_len) | |||
257 | && (unsigned long)&_root_fs_image_start >= ram_start | 260 | && (unsigned long)&_root_fs_image_start >= ram_start |
258 | && (unsigned long)&_root_fs_image_start < ram_end) | 261 | && (unsigned long)&_root_fs_image_start < ram_end) |
259 | reserve_bootmem ((unsigned long)&_root_fs_image_start, | 262 | reserve_bootmem ((unsigned long)&_root_fs_image_start, |
260 | &_root_fs_image_end - &_root_fs_image_start); | 263 | &_root_fs_image_end - &_root_fs_image_start, |
264 | BOOTMEM_DEFAULT); | ||
261 | 265 | ||
262 | /* Let the platform-dependent code reserve some too. */ | 266 | /* Let the platform-dependent code reserve some too. */ |
263 | if (mrb) | 267 | if (mrb) |