From: Andrew Morton Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton --- include/linux/ioport.h | 3 +-- kernel/resource.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff -puN include/linux/ioport.h~catch-valid-mem-range-at-onlining-memory-tidy include/linux/ioport.h --- devel/include/linux/ioport.h~catch-valid-mem-range-at-onlining-memory-tidy 2006-05-10 21:23:44.000000000 -0700 +++ devel-akpm/include/linux/ioport.h 2006-05-10 21:24:06.000000000 -0700 @@ -105,10 +105,9 @@ extern int allocate_resource(struct reso void *alignf_data); int adjust_resource(struct resource *res, resource_size_t start, resource_size_t size); -#ifdef CONFIG_MEMORY_HOTPLUG + /* get registered SYSTEM_RAM resources in specified area */ extern int find_next_system_ram(struct resource *res); -#endif /* Convenience shorthand with allocation */ #define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) diff -puN kernel/resource.c~catch-valid-mem-range-at-onlining-memory-tidy kernel/resource.c --- devel/kernel/resource.c~catch-valid-mem-range-at-onlining-memory-tidy 2006-05-10 21:23:44.000000000 -0700 +++ devel-akpm/kernel/resource.c 2006-05-10 21:23:44.000000000 -0700 @@ -258,7 +258,7 @@ int find_next_system_ram(struct resource end = res->end; read_lock(&resource_lock); - for( p = iomem_resource.child; p ; p = p->sibling) { + for (p = iomem_resource.child; p ; p = p->sibling) { /* system ram is just marked as IORESOURCE_MEM */ if (p->flags != res->flags) continue; @@ -277,7 +277,6 @@ int find_next_system_ram(struct resource res->end = p->end; return 0; } - #endif /* _