lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: split out common code into find_overlapped_early()

Browse Source 
This patch clean up reserve_early() family functions by extracting the
common part of reserve_early(), free_early() and bad_addr() into
find_overlapped_early().

Signed-off-by: Huang Ying <ying.huang@intel.com>
Cc: andi@firstfloor.org
Cc: mingo@redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Huang, Ying
2008-06-02 14:26:14 +08:00
committed by Thomas Gleixner
parent bd70e522af
commit d3fbe5ea95
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,20 +558,34 @@ static struct early_res early_res[MAX_EARLY_RES] __initdata = {
{} {}
}; };
static int __init find_overlapped_early(u64 start, u64 end)
{
int i;
struct early_res *r;
for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {
r = &early_res[i];
if (end > r->start && start < r->end)
break;
}
return i;
}
void __init reserve_early(u64 start, u64 end, char *name) void __init reserve_early(u64 start, u64 end, char *name)
{ {
int i; int i;
struct early_res *r; struct early_res *r;
for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {
r = &early_res[i]; i = find_overlapped_early(start, end);
if (end > r->start && start < r->end)
panic("Overlapping early reservations %llx-%llx %s to %llx-%llx %s\n",
start, end - 1, name?name:"", r->start,
r->end - 1, r->name);
}
if (i >= MAX_EARLY_RES) if (i >= MAX_EARLY_RES)
panic("Too many early reservations"); panic("Too many early reservations");
r = &early_res[i]; r = &early_res[i];
if (r->end)
panic("Overlapping early reservations "
"%llx-%llx %s to %llx-%llx %s\n",
start, end - 1, name?name:"", r->start,
r->end - 1, r->name);
r->start = start; r->start = start;
r->end = end; r->end = end;
if (name) if (name)
@@ -583,14 +597,11 @@ void __init free_early(u64 start, u64 end)
struct early_res *r; struct early_res *r;
int i, j; int i, j;
for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) { i = find_overlapped_early(start, end);
r = &early_res[i]; r = &early_res[i];
if (start == r->start && end == r->end) if (i >= MAX_EARLY_RES || r->end != end || r->start != start)
break;
}
if (i >= MAX_EARLY_RES || !early_res[i].end)
panic("free_early on not reserved area: %llx-%llx!", panic("free_early on not reserved area: %llx-%llx!",
start, end); start, end - 1);
for (j = i + 1; j < MAX_EARLY_RES && early_res[j].end; j++) for (j = i + 1; j < MAX_EARLY_RES && early_res[j].end; j++)
; ;
@@ -626,18 +637,17 @@ void __init early_res_to_bootmem(u64 start, u64 end)
static inline int __init bad_addr(u64 *addrp, u64 size, u64 align) static inline int __init bad_addr(u64 *addrp, u64 size, u64 align)
{ {
int i; int i;
u64 addr = *addrp, last; u64 addr = *addrp;
int changed = 0; int changed = 0;
struct early_res *r;
again: again:
last = addr + size; i = find_overlapped_early(addr, addr + size);
for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) { r = &early_res[i];
struct early_res *r = &early_res[i]; if (i < MAX_EARLY_RES && r->end) {
if (last >= r->start && addr < r->end) {
*addrp = addr = round_up(r->end, align); *addrp = addr = round_up(r->end, align);
changed = 1; changed = 1;
goto again; goto again;
} }
}
return changed; return changed;
} }