diff --git a/[refs] b/[refs] index 553a4d2e4538..706a20ec6303 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78a8b35bc7abf8b8333d6f625e08c0f7cc1c3742 +refs/heads/master: 6d7942dc2a70a7e74c352107b150265602671588 diff --git a/trunk/arch/x86/kernel/check.c b/trunk/arch/x86/kernel/check.c index b617b1164f1e..fc999e6fc46a 100644 --- a/trunk/arch/x86/kernel/check.c +++ b/trunk/arch/x86/kernel/check.c @@ -86,12 +86,12 @@ void __init setup_bios_corruption_check(void) if (!(addr + 1)) break; + if (addr >= corruption_check_size) + break; + if ((addr + size) > corruption_check_size) size = corruption_check_size - addr; - if (size == 0) - break; - e820_update_range(addr, size, E820_RAM, E820_RESERVED); scan_areas[num_scan_areas].addr = addr; scan_areas[num_scan_areas].size = size;