Commit b4ed1d15 authored by Wei Yang's avatar Wei Yang Committed by Ingo Molnar

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.
Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akataria@vmware.com
Link: http://lkml.kernel.org/r/1482676551-11411-1-git-send-email-richard.weiyang@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2d706e79
...@@ -30,8 +30,6 @@ extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type, ...@@ -30,8 +30,6 @@ extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type,
int checktype); int checktype);
extern void update_e820(void); extern void update_e820(void);
extern void e820_setup_gap(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; struct setup_data;
extern void parse_e820_ext(u64 phys_addr, u32 data_len); extern void parse_e820_ext(u64 phys_addr, u32 data_len);
......
...@@ -580,24 +580,19 @@ static void __init update_e820_saved(void) ...@@ -580,24 +580,19 @@ static void __init update_e820_saved(void)
} }
#define MAX_GAP_END 0x100000000ull #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, static int __init e820_search_gap(unsigned long *gapstart,
unsigned long start_addr, unsigned long long end_addr) unsigned long *gapsize)
{ {
unsigned long long last; unsigned long long last = MAX_GAP_END;
int i = e820->nr_map; int i = e820->nr_map;
int found = 0; int found = 0;
last = (end_addr && end_addr < MAX_GAP_END) ? end_addr : MAX_GAP_END;
while (--i >= 0) { while (--i >= 0) {
unsigned long long start = e820->map[i].addr; unsigned long long start = e820->map[i].addr;
unsigned long long end = start + e820->map[i].size; unsigned long long end = start + e820->map[i].size;
if (end < start_addr)
continue;
/* /*
* Since "last" is at most 4GB, we know we'll * Since "last" is at most 4GB, we know we'll
* fit in 32 bits if this condition is true * fit in 32 bits if this condition is true
...@@ -628,9 +623,8 @@ __init void e820_setup_gap(void) ...@@ -628,9 +623,8 @@ __init void e820_setup_gap(void)
unsigned long gapstart, gapsize; unsigned long gapstart, gapsize;
int found; int found;
gapstart = 0x10000000;
gapsize = 0x400000; gapsize = 0x400000;
found = e820_search_gap(&gapstart, &gapsize, 0, MAX_GAP_END); found = e820_search_gap(&gapstart, &gapsize);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
if (!found) { if (!found) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment