hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: change copy_e820_map to append_e820_map 

so it has a more meaningful name.
also change it to static.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-07-01 20:02:16 -07:00 committed by Ingo Molnar
parent 068b453834
commit dc8e8120ad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/e820.c
View File

@ -360,7 +360,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
return 0; 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) { while (nr_map) {
u64 start = biosmap->addr; 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 * 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. * 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 */ /* Only one memory region (or negative)? Ignore it */
if (nr_map < 2) if (nr_map < 2)
return -1; 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, 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) if (map_len > PAGE_SIZE)
sdata = early_ioremap(pa_data, map_len); sdata = early_ioremap(pa_data, map_len);
extmap = (struct e820entry *)(sdata->data); 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); sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
if (map_len > PAGE_SIZE) if (map_len > PAGE_SIZE)
early_iounmap(sdata, map_len); early_iounmap(sdata, map_len);
@ -1247,7 +1247,8 @@ char *__init default_machine_specific_memory_setup(void)
ARRAY_SIZE(boot_params.e820_map), ARRAY_SIZE(boot_params.e820_map),
&new_nr); &new_nr);
boot_params.e820_entries = 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; u64 mem_size;
/* compare results from other methods and take the greater */ /* compare results from other methods and take the greater */

1
include/asm-x86/e820.h
View File

@ -67,7 +67,6 @@ extern void e820_add_region(u64 start, u64 size, int type);
extern void e820_print_map(char *who); extern void e820_print_map(char *who);
extern int extern int
sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, int *pnr_map); sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, int *pnr_map);
extern int copy_e820_map(struct e820entry *biosmap, int nr_map);
extern u64 e820_update_range(u64 start, u64 size, unsigned old_type, extern u64 e820_update_range(u64 start, u64 size, unsigned old_type,
unsigned new_type); unsigned new_type);
extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type, extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type,