[v2,1/2] microblaze: remove unused alloc_maybe_bootmem

Message ID 77785f26fa882362b5e72e71845bb607f2cec757.1521040166.git.michal.simek@xilinx.com
State New
Headers show
Series
  • [v2,1/2] microblaze: remove unused alloc_maybe_bootmem
Related show

Commit Message

Michal Simek March 14, 2018, 3:09 p.m.
From: Rob Herring <robh@kernel.org>


alloc_maybe_bootmem is unused, so remove it.

Signed-off-by: Rob Herring <robh@kernel.org>

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

---

Changes in v2: None

 arch/microblaze/include/asm/setup.h | 1 -
 arch/microblaze/mm/init.c           | 8 --------
 2 files changed, 9 deletions(-)

-- 
1.9.1

Patch

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_early_init(const char *cmdline, unsigned int ram,
 void machine_halt(void);
 void machine_power_off(void);
 
-extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
 extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
 # 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)
 
 #endif /* CONFIG_MMU */
 
-void * __ref alloc_maybe_bootmem(size_t size, gfp_t mask)
-{
-	if (mem_init_done)
-		return kmalloc(size, mask);
-	else
-		return alloc_bootmem(size);
-}
-
 void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
 {
 	void *p;