leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/boot/e820: Rename the remaining E820 APIs to the e820__*() prefix

Browse Source 
Three more renames left:

   e820_end_of_ram_pfn()      =>  e820__end_of_ram_pfn()
   e820_end_of_low_ram_pfn()  =>  e820__end_of_low_ram_pfn()
   e820_reallocate_tables()   =>  e820__reallocate_tables()

After this all E820 API calls are prefixed with "e820__", making
it much easier to grep for E820 functionality in the kernel.

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:52:16 +01:00
parent dd618c7256
commit 0c6fc11ac3
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,8 @@ extern void e820__print_table(char *who);
extern int e820__update_table(struct e820_table *table); extern int e820__update_table(struct e820_table *table);
extern void e820__update_table_print(void); extern void e820__update_table_print(void);
extern unsigned long e820_end_of_ram_pfn(void); extern unsigned long e820__end_of_ram_pfn(void);
extern unsigned long e820_end_of_low_ram_pfn(void); extern unsigned long e820__end_of_low_ram_pfn(void);
extern u64 e820__memblock_alloc_reserved(u64 size, u64 align); extern u64 e820__memblock_alloc_reserved(u64 size, u64 align);
extern void e820__memblock_setup(void); extern void e820__memblock_setup(void);
@ -35,7 +35,7 @@ extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len);
extern char *e820__memory_setup_default(void); extern char *e820__memory_setup_default(void);
extern void e820__setup_pci_gap(void); extern void e820__setup_pci_gap(void);
extern void e820_reallocate_tables(void); extern void e820__reallocate_tables(void);
extern void e820__register_nosave_regions(unsigned long limit_pfn); extern void e820__register_nosave_regions(unsigned long limit_pfn);
/* /*

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

@ -641,7 +641,7 @@ __init void e820__setup_pci_gap(void)
* All functions which modify them are __init functions, which won't exist * All functions which modify them are __init functions, which won't exist
* after free_initmem(). * after free_initmem().
*/ */
__init void e820_reallocate_tables(void) __init void e820__reallocate_tables(void)
{ {
struct e820_table *n; struct e820_table *n;
int size; int size;
@ -803,12 +803,12 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, enum e820_type
return last_pfn; return last_pfn;
} }
unsigned long __init e820_end_of_ram_pfn(void) unsigned long __init e820__end_of_ram_pfn(void)
{ {
return e820_end_pfn(MAX_ARCH_PFN, E820_TYPE_RAM); return e820_end_pfn(MAX_ARCH_PFN, E820_TYPE_RAM);
} }
unsigned long __init e820_end_of_low_ram_pfn(void) unsigned long __init e820__end_of_low_ram_pfn(void)
{ {
return e820_end_pfn(1UL << (32 - PAGE_SHIFT), E820_TYPE_RAM); return e820_end_pfn(1UL << (32 - PAGE_SHIFT), E820_TYPE_RAM);
} }
@ -867,7 +867,7 @@ static int __init parse_memmap_one(char *p)
* the real memory size before the original memory map is * the real memory size before the original memory map is
* reset. * reset.
*/ */
saved_max_pfn = e820_end_of_ram_pfn(); saved_max_pfn = e820__end_of_ram_pfn();
#endif #endif
e820_table->nr_entries = 0; e820_table->nr_entries = 0;
userdef = 1; userdef = 1;

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

@ -1044,12 +1044,12 @@ void __init setup_arch(char **cmdline_p)
* partially used pages are not usable - thus * partially used pages are not usable - thus
* we are rounding upwards: * we are rounding upwards:
*/ */
max_pfn = e820_end_of_ram_pfn(); max_pfn = e820__end_of_ram_pfn();
/* update e820 for memory not covered by WB MTRRs */ /* update e820 for memory not covered by WB MTRRs */
mtrr_bp_init(); mtrr_bp_init();
if (mtrr_trim_uncached_memory(max_pfn)) if (mtrr_trim_uncached_memory(max_pfn))
max_pfn = e820_end_of_ram_pfn(); max_pfn = e820__end_of_ram_pfn();
max_possible_pfn = max_pfn; max_possible_pfn = max_pfn;
@ -1068,7 +1068,7 @@ void __init setup_arch(char **cmdline_p)
/* How many end-of-memory variables you have, grandma! */ /* How many end-of-memory variables you have, grandma! */
/* need this before calling reserve_initrd */ /* need this before calling reserve_initrd */
if (max_pfn > (1UL<<(32 - PAGE_SHIFT))) if (max_pfn > (1UL<<(32 - PAGE_SHIFT)))
max_low_pfn = e820_end_of_low_ram_pfn(); max_low_pfn = e820__end_of_low_ram_pfn();
else else
max_low_pfn = max_pfn; max_low_pfn = max_pfn;

2
arch/x86/mm/init.c
View File

@ -701,7 +701,7 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
void __ref free_initmem(void) void __ref free_initmem(void)
{ {
e820_reallocate_tables(); e820__reallocate_tables();
free_init_pages("unused kernel", free_init_pages("unused kernel",
(unsigned long)(&__init_begin), (unsigned long)(&__init_begin),