Signed-off-by: Vivek Goyal --- arch/i386/kernel/setup.c | 2 -- include/linux/ioport.h | 2 +- kernel/resource.c | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff -puN include/linux/ioport.h~struct-resource-start-field-expansion include/linux/ioport.h --- linux-2.6.16-rc6-1M/include/linux/ioport.h~struct-resource-start-field-expansion 2006-03-15 14:25:46.000000000 -0500 +++ linux-2.6.16-rc6-1M-root/include/linux/ioport.h 2006-03-15 14:25:46.000000000 -0500 @@ -15,7 +15,7 @@ */ struct resource { const char *name; - unsigned long start, end; + unsigned long long start, end; unsigned long flags; struct resource *parent, *sibling, *child; }; diff -puN kernel/resource.c~struct-resource-start-field-expansion kernel/resource.c --- linux-2.6.16-rc6-1M/kernel/resource.c~struct-resource-start-field-expansion 2006-03-15 14:25:46.000000000 -0500 +++ linux-2.6.16-rc6-1M-root/kernel/resource.c 2006-03-15 14:25:46.000000000 -0500 @@ -33,7 +33,7 @@ EXPORT_SYMBOL(ioport_resource); struct resource iomem_resource = { .name = "PCI mem", .start = 0UL, - .end = ~0UL, + .end = ~0ULL, .flags = IORESOURCE_MEM, }; @@ -83,7 +83,7 @@ static int r_show(struct seq_file *m, vo for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent) if (p->parent == root) break; - seq_printf(m, "%*s%0*lx-%0*lx : %s\n", + seq_printf(m, "%*s%0*Lx-%0*Lx : %s\n", depth * 2, "", width, r->start, width, r->end, @@ -151,8 +151,8 @@ __initcall(ioresources_init); /* Return the conflict entry if you can't request it */ static struct resource * __request_resource(struct resource *root, struct resource *new) { - unsigned long start = new->start; - unsigned long end = new->end; + unsigned long long start = new->start; + unsigned long long end = new->end; struct resource *tmp, **p; if (end < start) diff -puN arch/i386/kernel/setup.c~struct-resource-start-field-expansion arch/i386/kernel/setup.c --- linux-2.6.16-rc6-1M/arch/i386/kernel/setup.c~struct-resource-start-field-expansion 2006-03-15 14:25:46.000000000 -0500 +++ linux-2.6.16-rc6-1M-root/arch/i386/kernel/setup.c 2006-03-15 14:25:46.000000000 -0500 @@ -1286,8 +1286,6 @@ legacy_init_iomem_resources(struct resou 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 = alloc_bootmem_low(sizeof(struct resource)); switch (e820.map[i].type) { case E820_RAM: res->name = "System RAM"; break; _