diff options
author | Michal Simek <monstr@monstr.eu> | 2010-01-14 17:03:49 +0100 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-02-25 17:28:36 +0100 |
commit | d6c886fcea324a1a34478d02e27959f98a1aa37b (patch) | |
tree | 34d3fe110ea61950f8bdbb60f88b13bc51c30c88 /arch/microblaze/mm | |
parent | 57bd6d24018054c1bcd62a25ef9db242224bfdd2 (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) } return p; } + +void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask) +{ + if (mem_init_done) + return kmalloc(size, mask); + else + return alloc_bootmem(size); +} + +void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask) +{ + void *p; + + if (mem_init_done) + p = kzalloc(size, mask); + else { + p = alloc_bootmem(size); + if (p) + memset(p, 0, size); + } + return p; +} + #endif /* CONFIG_MMU */ |