aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-24 14:55:32 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:10:34 +0200
commit976dd4dc99c3eaf45e3802ed46e3cc06a1ad8689 (patch)
tree351ed6bc71666575f4981508f743a963f78f32eb /arch/x86
parent3a58a2a6c879b2e47daafd6e641661c50ac9da5a (diff)
x86: fix e820_update_range size when overlapping
before that we relay on sanitize_e820_map to remove the overlap. but e820_update_range(,,E820_RESERVED, E820_RAM) will not work this patch fix that who is going to use this? Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/e820.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 512f779fc6a..15b4393ff9b 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -425,6 +425,11 @@ u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
e820_add_region(final_start, final_end - final_start,
new_type);
real_updated_size += final_end - final_start;
+
+ ei->size -= final_end - final_start;
+ if (ei->addr < final_start)
+ continue;
+ ei->addr = final_end;
}
return real_updated_size;
}