5669c3cf19
This patch introduces zalloc_maybe_bootmem and uses it so that we don't have to mark a whole (largish) routine as __init_ref_ok. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
30 lines
517 B
C
30 lines
517 B
C
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/system.h>
|
|
|
|
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;
|
|
}
|