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

Commit 24aa0788 authored by Tejun Heo's avatar Tejun Heo Committed by H. Peter Anvin
Browse files

memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones 



Other than sanity check and debug message, the x86 specific version of
memblock reserve/free functions are simple wrappers around the generic
versions - memblock_reserve/free().

This patch adds debug messages with caller identification to the
generic versions and replaces x86 specific ones and kills them.
arch/x86/include/asm/memblock.h and arch/x86/mm/memblock.c are empty
after this change and removed.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310462166-31469-14-git-send-email-tj@kernel.org


Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c378ddd5

arch/x86/include/asm/memblock.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _X86_MEMBLOCK_H

#define _X86_MEMBLOCK_H



void memblock_x86_reserve_range(u64 start, u64 end, char *name);

void memblock_x86_free_range(u64 start, u64 end);



#endif

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static u32 __init allocate_aperture(void) 
				addr, aper_size>>10);

		return 0;

	}

	memblock_x86_reserve_range(addr, addr + aper_size, "aperture64");

	memblock_reserve(addr, aper_size);

	/*

	 * Kmemleak should not scan this block as it may not be mapped via the

	 * kernel direct mapping.

arch/x86/kernel/check.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void __init setup_bios_corruption_check(void) 
		if (start >= end)

			continue;



		memblock_x86_reserve_range(start, end, "SCAN RAM");

		memblock_reserve(start, end - start);

		scan_areas[num_scan_areas].addr = start;

		scan_areas[num_scan_areas].size = end - start;

arch/x86/kernel/head.c

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ void __init reserve_ebda_region(void) 
		lowmem = 0x9f000;



	/* reserve all memory between lowmem and the 1MB mark */

	memblock_x86_reserve_range(lowmem, 0x100000, "* BIOS reserved");

	memblock_reserve(lowmem, 0x100000 - lowmem);

}

arch/x86/kernel/head32.c

+3 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ void __init i386_start_kernel(void) 
{

	memblock_init();



	memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");

	memblock_reserve(__pa_symbol(&_text),

			 __pa_symbol(&__bss_stop) - __pa_symbol(&_text));



#ifdef CONFIG_BLK_DEV_INITRD

	/* Reserve INITRD */
@@ -42,7 +43,7 @@ void __init i386_start_kernel(void) 
		u64 ramdisk_image = boot_params.hdr.ramdisk_image;

		u64 ramdisk_size  = boot_params.hdr.ramdisk_size;

		u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);

		memblock_x86_reserve_range(ramdisk_image, ramdisk_end, "RAMDISK");

		memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image);

	}

#endif