x86/e820: make e820_search_gap() static and remove unused variables
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 x86/e820: make e820_search_gap() static and remove unused variables
e820_search_gap() is just used locally now and the start_addr and end_addr is fixed. Also gapstart is not checked in this function.
The patch makes e820_search_gap() static and remove those unused variables.
--- arch/x86/include/asm/e820.h | 2 -- arch/x86/kernel/e820.c | 16 +++++----------- 2 files changed, 5 insertions(+), 13 deletions(-)
arch/x86/include/asm/e820.h +0 -2
@@ -26,8 +26,6 @@ extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type, int checktype);extern void update_e820 (void );extern void e820_setup_gap (void ); -extern int e820_search_gap (unsigned long *gapstart,unsigned long *gapsize, -unsigned long start_addr,unsigned long long end_addr);struct setup_data ;extern void parse_e820_ext (u64 phys_addr,u32 data_len);
arch/x86/kernel/e820.c +5 -11
@@ -586,24 +586,19 @@ static void __init update_e820_saved(void) }#define MAX_GAP_END 0x100000000ull/* -* Search for a gap in the e820 memory space from start_addr to end_addr. +* Search for a gap in the e820 memory space from 0 to MAX_GAP_END. */ -__init int e820_search_gap (unsigned long *gapstart,unsigned long *gapsize, -unsigned long start_addr,unsigned long long end_addr) +static int __init e820_search_gap (unsigned long *gapstart, +unsigned long *gapsize) { -unsigned long long last; +unsigned long long last =MAX_GAP_END ;int i = e820->nr_map;int found =0 ; - last = (end_addr && end_addr <MAX_GAP_END ) ? end_addr :MAX_GAP_END ; -while (--i >=0 ) {unsigned long long start = e820->map[i].addr;unsigned long long end = start + e820->map[i].size; -if (end < start_addr) -continue ; -/* * Since "last" is at most 4GB, we know we'll * fit in 32 bits if this condition is true
@@ -634,9 +629,8 @@ __init void e820_setup_gap(void)unsigned long gapstart, gapsize;int found; - gapstart =0x10000000 ; gapsize =0x400000 ; - found =e820_search_gap (&gapstart, &gapsize,0 ,MAX_GAP_END ); + found =e820_search_gap (&gapstart, &gapsize);#ifdef CONFIG_X86_64 if (!found) {
Signature · 1 line
2.5.0
Quoted 6 lines · Wei Yang
e820_search_gap()is just used locally now and thestart_addrandend_addris fixed. Also gapstart is not checked in this function.The patch makes
e820_search_gap()static and remove those unused variables.Signed-off-by Wei Yang <[email protected]>
tip-bot for Wei Yang
merge bot[tip:x86/boot] x86/e820: Make e820_search_gap() static and remove unused variables
In reply to Wei Yangx86/e820: Make e820_search_gap() static and remove unused variables
Commit-ID: b4ed1d15b453c86b4b9362128bd7a0ecd95a105c Gitweb: http://git.kernel.org/tip/b4ed1d15b453c86b4b9362128bd7a0ecd95a105c Author: Wei Yang <[email protected]> AuthorDate: Sun, 25 Dec 2016 14:35:51 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 28 Dec 2016 09:20:29 +0100
x86/e820: Make e820_search_gap() static and remove unused variables
e820_search_gap() is just used locally now and the 'start_addr' and 'end_addr' parameters are fixed values. Also, 'gapstart' is not checked in this function anymore.
So make the function static and remove those unused variables.
--- arch/x86/include/asm/e820.h | 2 -- arch/x86/kernel/e820.c | 16 +++++----------- 2 files changed, 5 insertions(+), 13 deletions(-)
arch/x86/include/asm/e820.h +0 -2
@@ -30,8 +30,6 @@ extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type, int checktype);extern void update_e820 (void );extern void e820_setup_gap (void ); -extern int e820_search_gap (unsigned long *gapstart,unsigned long *gapsize, -unsigned long start_addr,unsigned long long end_addr);struct setup_data ;extern void parse_e820_ext (u64 phys_addr,u32 data_len);
arch/x86/kernel/e820.c +5 -11
@@ -580,24 +580,19 @@ static void __init update_e820_saved(void) }#define MAX_GAP_END 0x100000000ull/* -* Search for a gap in the e820 memory space from start_addr to end_addr. +* Search for a gap in the e820 memory space from 0 to MAX_GAP_END. */ -__init int e820_search_gap (unsigned long *gapstart,unsigned long *gapsize, -unsigned long start_addr,unsigned long long end_addr) +static int __init e820_search_gap (unsigned long *gapstart, +unsigned long *gapsize) { -unsigned long long last; +unsigned long long last =MAX_GAP_END ;int i = e820->nr_map;int found =0 ; - last = (end_addr && end_addr <MAX_GAP_END ) ? end_addr :MAX_GAP_END ; -while (--i >=0 ) {unsigned long long start = e820->map[i].addr;unsigned long long end = start + e820->map[i].size; -if (end < start_addr) -continue ; -/* * Since "last" is at most 4GB, we know we'll * fit in 32 bits if this condition is true
@@ -628,9 +623,8 @@ __init void e820_setup_gap(void)unsigned long gapstart, gapsize;int found; - gapstart =0x10000000 ; gapsize =0x400000 ; - found =e820_search_gap (&gapstart, &gapsize,0 ,MAX_GAP_END ); + found =e820_search_gap (&gapstart, &gapsize);#ifdef CONFIG_X86_64 if (!found) {