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

Commit d0be6bde authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: rename two e820 related functions 



rename update_memory_range to e820_update_range
rename add_memory_region to e820_add_region

to make it more clear that they are about e820 map operations.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6df8809b

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void __init early_gart_iommu_check(void) 
				    E820_RAM)) {

			/* reserved it, so we can resuse it in second kernel */

			printk(KERN_INFO "update e820 for GART\n");

			add_memory_region(aper_base, aper_size, E820_RESERVED);

			e820_add_region(aper_base, aper_size, E820_RESERVED);

			update_e820();

		}

		return;

arch/x86/kernel/cpu/mtrr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static u64 __init real_trim_memory(unsigned long start_pfn, 
	trim_size <<= PAGE_SHIFT;

	trim_size -= trim_start;



	return update_memory_range(trim_start, trim_size, E820_RAM,

	return e820_update_range(trim_start, trim_size, E820_RAM,

				E820_RESERVED);

}

/**

arch/x86/kernel/e820.c

+8 −8
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int __init e820_all_mapped(u64 start, u64 end, unsigned type) 
/*

 * Add a memory region to the kernel e820 map.

 */

void __init add_memory_region(u64 start, u64 size, int type)

void __init e820_add_region(u64 start, u64 size, int type)

{

	int x = e820.nr_map;
@@ -384,12 +384,12 @@ int __init copy_e820_map(struct e820entry *biosmap, int nr_map) 
		if (start > end)

			return -1;



		add_memory_region(start, size, type);

		e820_add_region(start, size, type);

	} while (biosmap++, --nr_map);

	return 0;

}



u64 __init update_memory_range(u64 start, u64 size, unsigned old_type,

u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,

				unsigned new_type)

{

	int i;
@@ -414,7 +414,7 @@ u64 __init update_memory_range(u64 start, u64 size, unsigned old_type, 
		final_end = min(start + size, ei->addr + ei->size);

		if (final_start >= final_end)

			continue;

		add_memory_region(final_start, final_end - final_start,

		e820_add_region(final_start, final_end - final_start,

					 new_type);

		real_updated_size += final_end - final_start;

	}
@@ -774,7 +774,7 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align) 
		return 0;



	addr = round_down(start + size - sizet, align);

	update_memory_range(addr, sizet, E820_RAM, E820_RESERVED);

	e820_update_range(addr, sizet, E820_RAM, E820_RESERVED);

	printk(KERN_INFO "update e820 for early_reserve_e820\n");

	update_e820();
@@ -949,13 +949,13 @@ static int __init parse_memmap_opt(char *p) 
	userdef = 1;

	if (*p == '@') {

		start_at = memparse(p+1, &p);

		add_memory_region(start_at, mem_size, E820_RAM);

		e820_add_region(start_at, mem_size, E820_RAM);

	} else if (*p == '#') {

		start_at = memparse(p+1, &p);

		add_memory_region(start_at, mem_size, E820_ACPI);

		e820_add_region(start_at, mem_size, E820_ACPI);

	} else if (*p == '$') {

		start_at = memparse(p+1, &p);

		add_memory_region(start_at, mem_size, E820_RESERVED);

		e820_add_region(start_at, mem_size, E820_RESERVED);

	} else {

		end_user_pfn = (mem_size >> PAGE_SHIFT);

	}

arch/x86/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void __init add_efi_memmap(void) 
			e820_type = E820_RAM;

		else

			e820_type = E820_RESERVED;

		add_memory_region(start, size, e820_type);

		e820_add_region(start, size, e820_type);

	}

	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);

}

arch/x86/lguest/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static __init char *lguest_memory_setup(void) 


	/* The Linux bootloader header contains an "e820" memory map: the

	 * Launcher populated the first entry with our memory limit. */

	add_memory_region(boot_params.e820_map[0].addr,

	e820_add_region(boot_params.e820_map[0].addr,

			  boot_params.e820_map[0].size,

			  boot_params.e820_map[0].type);