diff options
author | Yinghai Lu <yhlu.kernel.send@gmail.com> | 2008-03-21 21:56:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:21 -0400 |
commit | c64df70793a9c344874eb4af19f85e0662d2d3ee (patch) | |
tree | df6ec69fed0d4f4e2192692558dc7dc20bfa9645 /arch/x86/kernel/e820_64.c | |
parent | 9b967106da0357ef8b08847dce35584a04134f20 (diff) |
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, | |||
241 | /* | 241 | /* |
242 | * Find next free range after *start | 242 | * Find next free range after *start |
243 | */ | 243 | */ |
244 | unsigned long __init find_e820_area_size(unsigned long start, unsigned long *sizep, unsigned long align) | 244 | unsigned long __init find_e820_area_size(unsigned long start, |
245 | unsigned long *sizep, | ||
246 | unsigned long align) | ||
245 | { | 247 | { |
246 | int i; | 248 | int i; |
247 | 249 | ||
@@ -254,17 +256,15 @@ unsigned long __init find_e820_area_size(unsigned long start, unsigned long *siz | |||
254 | continue; | 256 | continue; |
255 | addr = round_up(ei->addr, align); | 257 | addr = round_up(ei->addr, align); |
256 | ei_last = ei->addr + ei->size; | 258 | ei_last = ei->addr + ei->size; |
257 | // printk(KERN_DEBUG "find_e820_area_size : e820 %d [%llx, %lx]\n", i, ei->addr, ei_last); | ||
258 | if (addr < start) | 259 | if (addr < start) |
259 | addr = round_up(start, align); | 260 | addr = round_up(start, align); |
260 | // printk(KERN_DEBUG "find_e820_area_size : 0 [%lx, %lx]\n", addr, ei_last); | ||
261 | if (addr >= ei_last) | 261 | if (addr >= ei_last) |
262 | continue; | 262 | continue; |
263 | *sizep = ei_last - addr; | 263 | *sizep = ei_last - addr; |
264 | while (bad_addr_size(&addr, sizep, align) && addr+ *sizep <= ei_last) | 264 | while (bad_addr_size(&addr, sizep, align) && |
265 | addr + *sizep <= ei_last) | ||
265 | ; | 266 | ; |
266 | last = addr + *sizep; | 267 | last = addr + *sizep; |
267 | // printk(KERN_DEBUG "find_e820_area_size : 1 [%lx, %lx]\n", addr, last); | ||
268 | if (last > ei_last) | 268 | if (last > ei_last) |
269 | continue; | 269 | continue; |
270 | return addr; | 270 | return addr; |