From 79bf74f69ec70f52e5424b7992d9f0f2e88d9f4f Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 11 Jan 2006 22:43:39 +0100
Subject: [PATCH] --- yaml --- r: 17951 b: refs/heads/master c:
 7a4a76cc1057de0dc96ee481590347aa8c5b9ffb h: refs/heads/master i:   17949:
 e726ac7ef5bae5cf70dc4da1e02d707901117f2d   17947:
 9641cec83b29ab8e06a80c1e56205e30b56774fc   17943:
 bcab31a4de7597ba9710dd05b677a42f09bd1ab1   17935:
 e08bbf1743570efd07ca0ceb2259b741bb63596f   17919:
 75e8ca1c5d5316a0863a96672c14ecfbc0182bed v: v3

---
 [refs]                             | 2 +-
 trunk/arch/i386/kernel/acpi/boot.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4886ece09982..5aa835ce976c 100644
--- 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
index 447fa9e33ffb..2111529dea77 100644
--- 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;