Revert "[PATCH] i386: export: memory more than 4G through /proc/iomem"

This reverts commit 10dbe196a8da6b3196881269c6639c0ec11c36cb.

The resource struct is still 32-bit, so trying to save a 64-bit memory
size there obviously won't work.

When we merge the 64-bit resource series, we can re-enable this.

Thanks to Sachin Sant and Maneesh Soni for debugging

Cc: Maneesh Soni <[email protected]>
Cc: Sachin Sant <[email protected]>
Cc: Russell King <[email protected]>
Cc: Sharyathi Nagesh <[email protected]>
Cc: Arjan van de Ven <[email protected]>
Cc: Vivek Goyal <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index d77e89ac0d540361c06da2854d8450fb4c81044e..846e1639ef7ce4bb928673b1705a1590345db247 100644 (file)
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1320,6 +1320,8 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
        probe_roms();
        for (i = 0; i < e820.nr_map; i++) {
                struct resource *res;
+               if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
+                       continue;
                res = kzalloc(sizeof(struct resource), GFP_ATOMIC);
                switch (e820.map[i].type) {
                case E820_RAM:  res->name = "System RAM"; break;