[PATCH] 64bit resources i386 proc iomem fix

[PATCH] 64bit resources i386 proc iomem fix

[Vivek Goyal]

Hi Greg,

With the recent changes to 64bit resources Kconfig options, following 
patch shall have to be applied to make sure things are not broken
on i386. Can you please include this patch.

Thanks
Vivek



o Avoid exporting memory more than 4G through /proc/iomem on i386 if
  CONFIG_RESOURCES_64BIT is not defined. Resources subsystem can not handle
  it.

o This patch is required after the recent re-organization of kconfig option
  for 64bit resources.


Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
---

 linux-2.6.17-rc6-1M-vivek/arch/i386/kernel/setup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/kernel/setup.c~64bit-resources-i386-proc-iomem-fix arch/i386/kernel/setup.c
--- linux-2.6.17-rc6-1M/arch/i386/kernel/setup.c~64bit-resources-i386-proc-iomem-fix	2006-06-19 14:46:05.000000000 -0400
+++ linux-2.6.17-rc6-1M-vivek/arch/i386/kernel/setup.c	2006-06-19 14:46:37.000000000 -0400
@@ -1338,7 +1338,7 @@ legacy_init_iomem_resources(struct resou
 	probe_roms();
 	for (i = 0; i < e820.nr_map; i++) {
 		struct resource *res;
-#ifdef CONFIG_RESOURCES_32BIT
+#ifndef CONFIG_RESOURCES_64BIT
 		if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
 			continue;
 #endif
_