From f0e42acdcadaf59dcbced2f26223d49f3b9805ed Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 6 Sep 2005 15:16:20 -0700 Subject: [PATCH] --- yaml --- r: 7323 b: refs/heads/master c: 48c8b1134249432318c8e5d19adc37c45242c4b1 h: refs/heads/master i: 7321: ec97eb3b35fb377e4d20e2de0f70dd8eb02a5ee1 7319: 9b83559161ede7374c0a84601283f2f7bf39ae33 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/e820.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 389a098865aa..24c3aa998468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a888cebe17e39476e5ca18c3a4bd96c6775070db +refs/heads/master: 48c8b1134249432318c8e5d19adc37c45242c4b1 diff --git a/trunk/arch/x86_64/kernel/e820.c b/trunk/arch/x86_64/kernel/e820.c index b548dea4e5b9..116ac5f53dce 100644 --- a/trunk/arch/x86_64/kernel/e820.c +++ b/trunk/arch/x86_64/kernel/e820.c @@ -85,7 +85,7 @@ int __init e820_mapped(unsigned long start, unsigned long end, unsigned type) struct e820entry *ei = &e820.map[i]; if (type && ei->type != type) continue; - if (ei->addr >= end || ei->addr + ei->size < start) + if (ei->addr >= end || ei->addr + ei->size <= start) continue; return 1; }