powerpc: Remove bootmem allocator
At the moment we transition from the memblock alloctor to the bootmem allocator. Gitting rid of the bootmem allocator removes a bunch of complicated code (most of which I owe the dubious honour of being responsible for writing). Signed-off-by: Anton Blanchard <anton@samba.org> Tested-by: Emil Medve <Emilian.Medve@Freescale.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:

committed by
Michael Ellerman

parent
16d0f5c4af
commit
10239733ee
@@ -18,7 +18,7 @@
|
||||
#include <linux/irq.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/fsl-diu-fb.h>
|
||||
#include <linux/bootmem.h>
|
||||
#include <linux/memblock.h>
|
||||
#include <sysdev/fsl_soc.h>
|
||||
|
||||
#include <asm/cacheflush.h>
|
||||
@@ -297,14 +297,13 @@ static void __init mpc512x_setup_diu(void)
|
||||
* and so negatively affect boot time. Instead we reserve the
|
||||
* already configured frame buffer area so that it won't be
|
||||
* destroyed. The starting address of the area to reserve and
|
||||
* also it's length is passed to reserve_bootmem(). It will be
|
||||
* also it's length is passed to memblock_reserve(). It will be
|
||||
* freed later on first open of fbdev, when splash image is not
|
||||
* needed any more.
|
||||
*/
|
||||
if (diu_shared_fb.in_use) {
|
||||
ret = reserve_bootmem(diu_shared_fb.fb_phys,
|
||||
diu_shared_fb.fb_len,
|
||||
BOOTMEM_EXCLUSIVE);
|
||||
ret = memblock_reserve(diu_shared_fb.fb_phys,
|
||||
diu_shared_fb.fb_len);
|
||||
if (ret) {
|
||||
pr_err("%s: reserve bootmem failed\n", __func__);
|
||||
diu_shared_fb.in_use = false;
|
||||
|
Reference in New Issue
Block a user