diff options
Diffstat (limited to 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 579382c163a9..59736317bf0e 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -143,8 +143,8 @@ int arch_add_memory(int nid, u64 start, u64 size) | |||
143 | * memory regions, find holes and callback for contiguous regions. | 143 | * memory regions, find holes and callback for contiguous regions. |
144 | */ | 144 | */ |
145 | int | 145 | int |
146 | walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, | 146 | walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, |
147 | int (*func)(unsigned long, unsigned long, void *)) | 147 | void *arg, int (*func)(unsigned long, unsigned long, void *)) |
148 | { | 148 | { |
149 | struct lmb_property res; | 149 | struct lmb_property res; |
150 | unsigned long pfn, len; | 150 | unsigned long pfn, len; |
@@ -166,7 +166,7 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, | |||
166 | } | 166 | } |
167 | return ret; | 167 | return ret; |
168 | } | 168 | } |
169 | EXPORT_SYMBOL_GPL(walk_memory_resource); | 169 | EXPORT_SYMBOL_GPL(walk_system_ram_range); |
170 | 170 | ||
171 | /* | 171 | /* |
172 | * Initialize the bootmem system and give it all the memory we | 172 | * Initialize the bootmem system and give it all the memory we |
@@ -372,7 +372,7 @@ void __init mem_init(void) | |||
372 | 372 | ||
373 | printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " | 373 | printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " |
374 | "%luk reserved, %luk data, %luk bss, %luk init)\n", | 374 | "%luk reserved, %luk data, %luk bss, %luk init)\n", |
375 | (unsigned long)nr_free_pages() << (PAGE_SHIFT-10), | 375 | nr_free_pages() << (PAGE_SHIFT-10), |
376 | num_physpages << (PAGE_SHIFT-10), | 376 | num_physpages << (PAGE_SHIFT-10), |
377 | codesize >> 10, | 377 | codesize >> 10, |
378 | reservedpages << (PAGE_SHIFT-10), | 378 | reservedpages << (PAGE_SHIFT-10), |