Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/setup.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN arch/i386/kernel/setup.c~gregkh-pci-i386-export-memory-more-than-4g-through-proc-iomem arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~gregkh-pci-i386-export-memory-more-than-4g-through-proc-iomem
+++ a/arch/i386/kernel/setup.c
@@ -1319,8 +1319,10 @@ legacy_init_iomem_resources(struct resou
 	probe_roms();
 	for (i = 0; i < e820.nr_map; i++) {
 		struct resource *res;
+#ifdef CONFIG_RESOURCES_32BIT
 		if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
 			continue;
+#endif
 		res = kzalloc(sizeof(struct resource), GFP_ATOMIC);
 		switch (e820.map[i].type) {
 		case E820_RAM:	res->name = "System RAM"; break;
_