Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 976dd4dc authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

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: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3a58a2a6

arch/x86/kernel/e820.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

}