diff options
| author |   Yinghai Lu <yhlu.kernel.send@gmail.com> | 2008-03-21 18:56:19 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:21 +0200 |
| commit | c64df70793a9c344874eb4af19f85e0662d2d3ee (patch) | |
| tree | df6ec69fed0d4f4e2192692558dc7dc20bfa9645 /arch/x86/kernel/e820_64.c | |
| parent | x86: fix smpboot integration (diff) | |
| download | linux-dev-c64df70793a9c344874eb4af19f85e0662d2d3ee.tar.xz linux-dev-c64df70793a9c344874eb4af19f85e0662d2d3ee.zip | |
x86: memtest bootparam
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/e820_64.c')
| -rw-r--r-- | arch/x86/kernel/e820_64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c index 9184e6437c4f..d6ada0833876 100644 --- a/arch/x86/kernel/e820_64.c +++ b/arch/x86/kernel/e820_64.c @@ -241,7 +241,9 @@ unsigned long __init find_e820_area(unsigned long start, unsigned long end, /* * Find next free range after *start */ -unsigned long __init find_e820_area_size(unsigned long start, unsigned long *sizep, unsigned long align) +unsigned long __init find_e820_area_size(unsigned long start, + unsigned long *sizep, + unsigned long align) { int i; @@ -254,17 +256,15 @@ unsigned long __init find_e820_area_size(unsigned long start, unsigned long *siz continue; addr = round_up(ei->addr, align); ei_last = ei->addr + ei->size; -// printk(KERN_DEBUG "find_e820_area_size : e820 %d [%llx, %lx]\n", i, ei->addr, ei_last); if (addr < start) addr = round_up(start, align); -// printk(KERN_DEBUG "find_e820_area_size : 0 [%lx, %lx]\n", addr, ei_last); if (addr >= ei_last) continue; *sizep = ei_last - addr; - while (bad_addr_size(&addr, sizep, align) && addr+ *sizep <= ei_last) + while (bad_addr_size(&addr, sizep, align) && + addr + *sizep <= ei_last) ; last = addr + *sizep; -// printk(KERN_DEBUG "find_e820_area_size : 1 [%lx, %lx]\n", addr, last); if (last > ei_last) continue; return addr; |