| Message ID | 1369838692-26860-9-git-send-email-jiang.liu@huawei.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 3f31102..cf4ca13 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -585,18 +585,8 @@ void __init mem_init(void) > BITS_PER_LONG); high_memory = __va((max_pfn << PAGE_SHIFT)); - -#ifndef CONFIG_DISCONTIGMEM - max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1; + set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1); free_all_bootmem(); -#else - { - int i; - - for (i = 0; i < npmem_ranges; i++) - free_all_bootmem_node(NODE_DATA(i)); - } -#endif #ifdef CONFIG_PA11 if (hppa_dma_ops == &pcxl_dma_ops) {
Prepare for killing free_all_bootmem_node() by using free_all_bootmem(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: Michal Hocko <mhocko@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: linux-parisc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/parisc/mm/init.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)