diff --git a/[refs] b/[refs] index 85a067dbddb6..9ad3f8c335bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 117090b5e815d0075bff85c2be954d68a11ac4ed +refs/heads/master: 7c7a3897f678cfafebc8ec0a5e61a814f2f24e42 diff --git a/trunk/arch/x86_64/kernel/e820.c b/trunk/arch/x86_64/kernel/e820.c index bb0ae18ec02b..eb7929eea7b3 100644 --- a/trunk/arch/x86_64/kernel/e820.c +++ b/trunk/arch/x86_64/kernel/e820.c @@ -131,7 +131,7 @@ void __init e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned lon if (ei->type != E820_RAM || ei->addr+ei->size <= start || - ei->addr > end) + ei->addr >= end) continue; addr = round_up(ei->addr, PAGE_SIZE);