Commit 48c508b3 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: clean up find_e820_area(), 64-bit

Change size to unsigned long, becase caller and user all used unsigned long.
Also make bad_addr take an alignment parameter.
Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ef925766
...@@ -95,7 +95,8 @@ void __init early_res_to_bootmem(void) ...@@ -95,7 +95,8 @@ void __init early_res_to_bootmem(void)
} }
/* Check for already reserved areas */ /* Check for already reserved areas */
static inline int bad_addr(unsigned long *addrp, unsigned long size) static inline int
bad_addr(unsigned long *addrp, unsigned long size, unsigned long align)
{ {
int i; int i;
unsigned long addr = *addrp, last; unsigned long addr = *addrp, last;
...@@ -105,7 +106,7 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size) ...@@ -105,7 +106,7 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size)
for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) { for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {
struct early_res *r = &early_res[i]; struct early_res *r = &early_res[i];
if (last >= r->start && addr < r->end) { if (last >= r->start && addr < r->end) {
*addrp = addr = r->end; *addrp = addr = round_up(r->end, align);
changed = 1; changed = 1;
goto again; goto again;
} }
...@@ -174,26 +175,27 @@ int __init e820_all_mapped(unsigned long start, unsigned long end, ...@@ -174,26 +175,27 @@ int __init e820_all_mapped(unsigned long start, unsigned long end,
* Find a free area with specified alignment in a specific range. * Find a free area with specified alignment in a specific range.
*/ */
unsigned long __init find_e820_area(unsigned long start, unsigned long end, unsigned long __init find_e820_area(unsigned long start, unsigned long end,
unsigned size, unsigned long align) unsigned long size, unsigned long align)
{ {
int i; int i;
unsigned long mask = ~(align - 1);
for (i = 0; i < e820.nr_map; i++) { for (i = 0; i < e820.nr_map; i++) {
struct e820entry *ei = &e820.map[i]; struct e820entry *ei = &e820.map[i];
unsigned long addr = ei->addr, last; unsigned long addr, last;
unsigned long ei_last;
if (ei->type != E820_RAM) if (ei->type != E820_RAM)
continue; continue;
addr = round_up(ei->addr, align);
ei_last = ei->addr + ei->size;
if (addr < start) if (addr < start)
addr = start; addr = round_up(start, align);
if (addr > ei->addr + ei->size) if (addr > ei_last)
continue; continue;
while (bad_addr(&addr, size) && addr+size <= ei->addr+ei->size) while (bad_addr(&addr, size, align) && addr+size <= ei_last)
; ;
addr = (addr + align - 1) & mask;
last = addr + size; last = addr + size;
if (last > ei->addr + ei->size) if (last > ei_last)
continue; continue;
if (last > end) if (last > end)
continue; continue;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern unsigned long find_e820_area(unsigned long start, unsigned long end, extern unsigned long find_e820_area(unsigned long start, unsigned long end,
unsigned size, unsigned long align); unsigned long size, unsigned long align);
extern void add_memory_region(unsigned long start, unsigned long size, extern void add_memory_region(unsigned long start, unsigned long size,
int type); int type);
extern void update_memory_range(u64 start, u64 size, unsigned old_type, extern void update_memory_range(u64 start, u64 size, unsigned old_type,
......
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