|
@@ -360,7 +360,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int __init __copy_e820_map(struct e820entry *biosmap, int nr_map)
|
|
|
+static int __init __append_e820_map(struct e820entry *biosmap, int nr_map)
|
|
|
{
|
|
|
while (nr_map) {
|
|
|
u64 start = biosmap->addr;
|
|
@@ -389,13 +389,13 @@ static int __init __copy_e820_map(struct e820entry *biosmap, int nr_map)
|
|
|
* will have given us a memory map that we can use to properly
|
|
|
* set up memory. If we aren't, we'll fake a memory map.
|
|
|
*/
|
|
|
-int __init copy_e820_map(struct e820entry *biosmap, int nr_map)
|
|
|
+static int __init append_e820_map(struct e820entry *biosmap, int nr_map)
|
|
|
{
|
|
|
/* Only one memory region (or negative)? Ignore it */
|
|
|
if (nr_map < 2)
|
|
|
return -1;
|
|
|
|
|
|
- return __copy_e820_map(biosmap, nr_map);
|
|
|
+ return __append_e820_map(biosmap, nr_map);
|
|
|
}
|
|
|
|
|
|
u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
|
|
@@ -583,7 +583,7 @@ void __init parse_e820_ext(struct setup_data *sdata, unsigned long pa_data)
|
|
|
if (map_len > PAGE_SIZE)
|
|
|
sdata = early_ioremap(pa_data, map_len);
|
|
|
extmap = (struct e820entry *)(sdata->data);
|
|
|
- __copy_e820_map(extmap, entries);
|
|
|
+ __append_e820_map(extmap, entries);
|
|
|
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
|
|
|
if (map_len > PAGE_SIZE)
|
|
|
early_iounmap(sdata, map_len);
|
|
@@ -1247,7 +1247,8 @@ char *__init default_machine_specific_memory_setup(void)
|
|
|
ARRAY_SIZE(boot_params.e820_map),
|
|
|
&new_nr);
|
|
|
boot_params.e820_entries = new_nr;
|
|
|
- if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries) < 0) {
|
|
|
+ if (append_e820_map(boot_params.e820_map, boot_params.e820_entries)
|
|
|
+ < 0) {
|
|
|
u64 mem_size;
|
|
|
|
|
|
/* compare results from other methods and take the greater */
|