diff options
| -rw-r--r-- | arch/microblaze/include/asm/setup.h | 1 | ||||
| -rw-r--r-- | arch/microblaze/mm/init.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index be84a4d3917f..7c968c1d1729 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h | |||
| @@ -44,7 +44,6 @@ void machine_shutdown(void); | |||
| 44 | void machine_halt(void); | 44 | void machine_halt(void); |
| 45 | void machine_power_off(void); | 45 | void machine_power_off(void); |
| 46 | 46 | ||
| 47 | extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); | ||
| 48 | extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); | 47 | extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); |
| 49 | 48 | ||
| 50 | # endif /* __ASSEMBLY__ */ | 49 | # endif /* __ASSEMBLY__ */ |
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 434639f9a3a6..5bc9c7fbb541 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
| @@ -414,14 +414,6 @@ void __init *early_get_page(void) | |||
| 414 | 414 | ||
| 415 | #endif /* CONFIG_MMU */ | 415 | #endif /* CONFIG_MMU */ |
| 416 | 416 | ||
| 417 | void * __ref alloc_maybe_bootmem(size_t size, gfp_t mask) | ||
| 418 | { | ||
| 419 | if (mem_init_done) | ||
| 420 | return kmalloc(size, mask); | ||
| 421 | else | ||
| 422 | return alloc_bootmem(size); | ||
| 423 | } | ||
| 424 | |||
| 425 | void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask) | 417 | void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask) |
| 426 | { | 418 | { |
| 427 | void *p; | 419 | void *p; |
