---

yaml --- r: 17951 b: refs/heads/master c: 7a4a76c h: refs/heads/master i: 17949: e726ac7 17947: 9641cec 17943: bcab31a 17935: e08bbf1 17919: 75e8ca1 v: v3
git-mirror · Jan 12, 2006 · 79bf74f · 79bf74f
1 parent dc92e26
commit 79bf74f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7180d4fb83085fef9d24b353f5bd79cf6fd98447
+refs/heads/master: 7a4a76cc1057de0dc96ee481590347aa8c5b9ffb
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/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;