diff options
author | Michal Simek <monstr@monstr.eu> | 2010-01-14 11:03:49 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-03-11 07:59:02 -0500 |
commit | a84642a339235020e6dccc022de27055f1fa9340 (patch) | |
tree | a37bb8fa58d2e484ac73d0bb89275cecef9fd3d9 /arch/microblaze/mm | |
parent | 2549edd353196d7de9c18e08146d7a8836f97235 (diff) |
microblaze: Add {z,}alloc_maybe_bootmem functions
I will need {z,}alloc_maybe_bootmem functions for pci patches
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/mm')
-rw-r--r-- | arch/microblaze/mm/init.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index a57cedf36715..6eea5544ad8b 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
@@ -349,4 +349,27 @@ void __init *early_get_page(void) | |||
349 | } | 349 | } |
350 | return p; | 350 | return p; |
351 | } | 351 | } |
352 | |||
353 | void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask) | ||
354 | { | ||
355 | if (mem_init_done) | ||
356 | return kmalloc(size, mask); | ||
357 | else | ||
358 | return alloc_bootmem(size); | ||
359 | } | ||
360 | |||
361 | void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask) | ||
362 | { | ||
363 | void *p; | ||
364 | |||
365 | if (mem_init_done) | ||
366 | p = kzalloc(size, mask); | ||
367 | else { | ||
368 | p = alloc_bootmem(size); | ||
369 | if (p) | ||
370 | memset(p, 0, size); | ||
371 | } | ||
372 | return p; | ||
373 | } | ||
374 | |||
352 | #endif /* CONFIG_MMU */ | 375 | #endif /* CONFIG_MMU */ |