From 50a9d3d26eea4b1bb5de37f2833aa4592d9ab5c7 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Sat, 7 Feb 2009 15:39:38 -0800
Subject: [PATCH] --- yaml --- r: 136337 b: refs/heads/master c:
 eecb9a697f0b790e5840dae8a8b866bea49a86ee h: refs/heads/master i:   136335:
 cb514d77854c06b6b607c2e0be40092ef9acbd5e v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/acpi/boot.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a435cb90f2ab..ea20d940dfeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c14fa4937eb73509e07ac12bf8db1fdf4c42a59
+refs/heads/master: eecb9a697f0b790e5840dae8a8b866bea49a86ee
diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
index c518599e4264..5424a18f2e4e 100644
--- a/trunk/arch/x86/kernel/acpi/boot.c
+++ b/trunk/arch/x86/kernel/acpi/boot.c
@@ -127,9 +127,6 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 	if (!phys || !size)
 		return NULL;
 
-	if (phys+size <= (max_low_pfn_mapped << PAGE_SHIFT))
-		return __va(phys);
-
 	if (prev_map)
 		early_iounmap(prev_map, prev_size);