Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5026a7 authored by Tejun Heo's avatar Tejun Heo Committed by H. Peter Anvin
Browse files

memblock: Kill MEMBLOCK_ERROR 



25818f0f (memblock: Make MEMBLOCK_ERROR be 0) thankfully made
MEMBLOCK_ERROR 0 and there already are codes which expect error return
to be 0.  There's no point in keeping MEMBLOCK_ERROR around.  End its
misery.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310457490-3356-6-git-send-email-tj@kernel.org


Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 348968eb

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static u32 __init allocate_aperture(void) 
	 */

	addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,

				      aper_size, aper_size);

	if (addr == MEMBLOCK_ERROR || addr + aper_size > GART_MAX_ADDR) {

	if (!addr || addr + aper_size > GART_MAX_ADDR) {

		printk(KERN_ERR

			"Cannot allocate aperture memory hole (%lx,%uK)\n",

				addr, aper_size>>10);

arch/x86/kernel/check.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void __init setup_bios_corruption_check(void) 
		u64 size;

		addr = memblock_x86_find_in_range_size(addr, &size, PAGE_SIZE);



		if (addr == MEMBLOCK_ERROR)

		if (!addr)

			break;



		if (addr >= corruption_check_size)

arch/x86/kernel/e820.c

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align) 


	for (start = startt; ; start += size) {

		start = memblock_x86_find_in_range_size(start, &size, align);

		if (start == MEMBLOCK_ERROR)

		if (!start)

			return 0;

		if (size >= sizet)

			break;

arch/x86/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void __init relocate_initrd(void) 
	ramdisk_here = memblock_find_in_range(0, end_of_lowmem, area_size,

					 PAGE_SIZE);



	if (ramdisk_here == MEMBLOCK_ERROR)

	if (!ramdisk_here)

		panic("Cannot find place for new RAMDISK of size %lld\n",

			 ramdisk_size);
@@ -554,7 +554,7 @@ static void __init reserve_crashkernel(void) 
		crash_base = memblock_find_in_range(alignment,

			       CRASH_KERNEL_ADDR_MAX, crash_size, alignment);



		if (crash_base == MEMBLOCK_ERROR) {

		if (!crash_base) {

			pr_info("crashkernel reservation failed - No suitable area found.\n");

			return;

		}

arch/x86/kernel/trampoline.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ void __init setup_trampolines(void) 


	/* Has to be in very low memory so we can execute real-mode AP code. */

	mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);

	if (mem == MEMBLOCK_ERROR)

	if (!mem)

		panic("Cannot allocate trampoline\n");



	x86_trampoline_base = __va(mem);