Skip to content

Commit b48edb8

Browse files
chleroymichalsimek
authored andcommitted
microblaze: Remove zalloc_maybe_bootmem()
Last user of zalloc_maybe_bootmem() was removed by commit 4308e3c ("microblaze/PCI: Remove unused allocation & free of PCI host bridge structure") Remove it. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Link: https://lore.kernel.org/r/bfb1601cac24d7ef8e741c83f9301e4a5a87a0b5.1692124505.git.christophe.leroy@csgroup.eu Signed-off-by: Michal Simek <michal.simek@amd.com>
1 parent 0e9a2a2 commit b48edb8

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

arch/microblaze/include/asm/setup.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@ void machine_shutdown(void);
2525
void machine_halt(void);
2626
void machine_power_off(void);
2727

28-
extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
29-
3028
# endif /* __ASSEMBLY__ */
3129
#endif /* _ASM_MICROBLAZE_SETUP_H */

arch/microblaze/mm/init.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -270,22 +270,6 @@ asmlinkage void __init mmu_init(void)
270270
memblock_dump_all();
271271
}
272272

273-
void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
274-
{
275-
void *p;
276-
277-
if (mem_init_done) {
278-
p = kzalloc(size, mask);
279-
} else {
280-
p = memblock_alloc(size, SMP_CACHE_BYTES);
281-
if (!p)
282-
panic("%s: Failed to allocate %zu bytes\n",
283-
__func__, size);
284-
}
285-
286-
return p;
287-
}
288-
289273
static const pgprot_t protection_map[16] = {
290274
[VM_NONE] = PAGE_NONE,
291275
[VM_READ] = PAGE_READONLY_X,

0 commit comments

Comments
 (0)