diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 14:09:20 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 14:42:31 +0100 |
commit | f52355a99fc06f609ca6a61098d78e476d56f526 (patch) | |
tree | 9d50d7919888d905f6eae13e185d381a862234d3 /arch/x86/xen/setup.c | |
parent | x86/boot/e820: Rename update_e820() to e820__update_table() (diff) | |
download | linux-f52355a99fc06f609ca6a61098d78e476d56f526.tar.xz linux-f52355a99fc06f609ca6a61098d78e476d56f526.zip |
x86/boot/e820: Rename sanitize_e820_table() to e820__update_table()
sanitize_e820_table() is a minor misnomer in that it suggests that
the E820 table requires sanitizing - which implies that it will only
do anything if the E820 table is irregular (not sane).
That is wrong, because sanitize_e820_table() also does a very regular
sorting of the E820 table, which is a necessity in the basic
append-only flow of E820 updates the kernel is allowed to perform to
it.
So rename it to e820__update_table() to include that purpose as well.
This also lines up all the table-update functions into a coherent
naming family:
int e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);
void e820__update_table_print(void);
void e820__update_table_firmware(void);
No change in functionality.
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/setup.c')
-rw-r--r-- | arch/x86/xen/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 8b26b9282070..c2f8e4ab55bd 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -783,7 +783,7 @@ char * __init xen_memory_setup(void) xen_ignore_unusable(); /* Make sure the Xen-supplied memory map is well-ordered. */ - sanitize_e820_table(xen_e820_table, ARRAY_SIZE(xen_e820_table), + e820__update_table(xen_e820_table, ARRAY_SIZE(xen_e820_table), &xen_e820_table_entries); max_pages = xen_get_max_pages(); @@ -861,7 +861,7 @@ char * __init xen_memory_setup(void) e820_add_region(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RESERVED); - sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries); + e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries); /* * Check whether the kernel itself conflicts with the target E820 map. @@ -932,7 +932,7 @@ char * __init xen_auto_xlated_memory_setup(void) xen_e820_table_entries = memmap.nr_entries; - sanitize_e820_table(xen_e820_table, ARRAY_SIZE(xen_e820_table), + e820__update_table(xen_e820_table, ARRAY_SIZE(xen_e820_table), &xen_e820_table_entries); for (i = 0; i < xen_e820_table_entries; i++) |