diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-13 08:01:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-13 08:01:23 -0700 |
| commit | 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 (patch) | |
| tree | 7220f29b3d3e068c139904093ae3eb49b41f1ef2 | |
| parent | 032ebf2620ef99a4fedaa0f77dc2272095ac5863 (diff) | |
| download | kernel_samsung_aries-9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3.zip kernel_samsung_aries-9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3.tar.gz kernel_samsung_aries-9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3.tar.bz2 | |
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 <maneesh@in.ibm.com>
Cc: Sachin Sant <sachinp@in.ibm.com>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Sharyathi Nagesh <sharyath@in.ibm.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index d77e89a..846e163 100644 --- 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; |