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: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 774063f..5051ce7 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -94,7 +94,7 @@
/*
* 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 @@
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 @@
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 @@
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 @@
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);
}