openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/boot/e820: Rename e820_mark_nosave_regions() to e820__register_nosave_regions() 

This function is a minor misnomer: it is talking about 'marking' regions
as nosave - while the hibernation API is called register_nosave_region()
and the e820_mark_nosave_regions() is a wrapper around that functionality.

So name it to be in line with the API it is derived from.

( Rename e820_mark_nvs_memory() to e820__register_nvs_regions(), for similar
  reasons. )

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>
This commit is contained in:
Ingo Molnar 2017-01-28 22:44:12 +01:00
parent 1506c8dc94
commit 090d717164
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/e820/api.h
View File

@ -36,7 +36,7 @@ extern char *e820__memory_setup_default(void);
extern void e820__setup_pci_gap(void);
extern void e820_reallocate_tables(void);
extern void e820_mark_nosave_regions(unsigned long limit_pfn);
extern void e820__register_nosave_regions(unsigned long limit_pfn);
/*
* Returns true iff the specified range [start,end) is completely contained inside

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

@ -690,15 +690,15 @@ void __init e820__memory_setup_extended(u64 phys_addr, u32 data_len)
e820__print_table("extended");
}
/**
/*
* Find the ranges of physical addresses that do not correspond to
* E820 RAM areas and mark the corresponding pages as 'nosave' for
* E820 RAM areas and register the corresponding pages as 'nosave' for
* hibernation (32-bit) or software suspend and suspend to RAM (64-bit).
*
* This function requires the E820 map to be sorted and without any
* overlapping entries.
*/
void __init e820_mark_nosave_regions(unsigned long limit_pfn)
void __init e820__register_nosave_regions(unsigned long limit_pfn)
{
int i;
unsigned long pfn = 0;
@ -724,7 +724,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn)
* Register ACPI NVS memory regions, so that we can save/restore them during
* hibernation and the subsequent resume:
*/
static int __init e820_mark_nvs_memory(void)
static int __init e820__register_nvs_regions(void)
{
int i;
@ -737,7 +737,7 @@ static int __init e820_mark_nvs_memory(void)
return 0;
}
core_initcall(e820_mark_nvs_memory);
core_initcall(e820__register_nvs_regions);
#endif
/*

2
arch/x86/kernel/setup.c
View File

@ -1236,7 +1236,7 @@ void __init setup_arch(char **cmdline_p)
kvm_guest_init();
e820__reserve_resources();
e820_mark_nosave_regions(max_low_pfn);
e820__register_nosave_regions(max_low_pfn);
x86_init.resources.reserve_resources();