summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-09-06 15:16:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:16 -0700
commit48c8b1134249432318c8e5d19adc37c45242c4b1 (patch)
treec8ecc8563a1fc19b6909c8d709175792f618e856 /arch
parenta888cebe17e39476e5ca18c3a4bd96c6775070db (diff)
downloadop-kernel-dev-48c8b1134249432318c8e5d19adc37c45242c4b1.zip
op-kernel-dev-48c8b1134249432318c8e5d19adc37c45242c4b1.tar.gz
[PATCH] x86_64: Fix off by one in e820_mapped
This allows a valid iommu placed immediately after memory to work, to be recognized as after the last byte of memory and not overlapping it. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/e820.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index b548dea..116ac5f 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/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;
}
OpenPOWER on IntegriCloud