summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/acpi
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 22:43:39 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:04:51 -0800
commit7a4a76cc1057de0dc96ee481590347aa8c5b9ffb (patch)
treeb2f2b8d46fc859b2ec4e7b6e1d3d24ffc7d1c507 /arch/i386/kernel/acpi
parent7180d4fb83085fef9d24b353f5bd79cf6fd98447 (diff)
[PATCH] x86_64: Fix off by one in acpi table mapping
And fix the test to include the size Noticed by Vivek Goyal Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/acpi')
-rw-r--r--arch/i386/kernel/acpi/boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 447fa9e33ff..2111529dea7 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -108,7 +108,7 @@ char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
if (!phys_addr || !size)
return NULL;
- if (phys_addr < (end_pfn_map << PAGE_SHIFT))
+ if (phys_addr+size <= (end_pfn_map << PAGE_SHIFT) + PAGE_SIZE)
return __va(phys_addr);
return NULL;