From 409436d48fbc6a4b83495ed83c2e97b13be7dac4 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 2 Apr 2009 16:44:38 -0700
Subject: [PATCH] --- yaml --- r: 140452 b: refs/heads/master c:
 6a491e2e3e52a64c6d88a192c56499d931842ac5 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/mm/iomap_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef15513c7877..7947c176f434 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 484cad34dd667235565c14a40e2f5a8143184aaa
+refs/heads/master: 6a491e2e3e52a64c6d88a192c56499d931842ac5
diff --git a/trunk/arch/x86/mm/iomap_32.c b/trunk/arch/x86/mm/iomap_32.c
index e331f77348a7..8056545e2d39 100644
--- a/trunk/arch/x86/mm/iomap_32.c
+++ b/trunk/arch/x86/mm/iomap_32.c
@@ -23,7 +23,7 @@
 
 int is_io_mapping_possible(resource_size_t base, unsigned long size)
 {
-#ifndef CONFIG_X86_PAE
+#if !defined(CONFIG_X86_PAE) && defined(CONFIG_PHYS_ADDR_T_64BIT)
 	/* There is no way to map greater than 1 << 32 address without PAE */
 	if (base + size > 0x100000000ULL)
 		return 0;