From patchwork Wed May 29 14:44:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2630631 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4D2C5DF24C for ; Wed, 29 May 2013 14:47:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966497Ab3E2Opo (ORCPT ); Wed, 29 May 2013 10:45:44 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:58643 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966482Ab3E2Opm (ORCPT ); Wed, 29 May 2013 10:45:42 -0400 Received: by mail-pa0-f54.google.com with SMTP id kx1so9389028pab.13 for ; Wed, 29 May 2013 07:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=hDgl8qrzCwB8TLeHRbgLldt4OuzVwXAluJPHvByrfos=; b=q55mn+4agW0YCPlWyQVD1wMEQEixGkqI/Mf0ZLMYi4Tcin+Pi7cVYQ5OWbO4+xXWMu f/FmhbARADIY6uHbAaUmTFTKsFQyomqx3giBKcgAxiHik+CH6udb8WEBfERdRYD7pt9K 07qq2NMtZXF55TYLzidacuVelX4bASrM9lm3BaLiyUjli0ZTMRNtELXjQZIvyCSYFI2V iS/nKndMSm8Anzfaw/J9FyCc4QZNFI2JU8SvM5N0hw0JztwsUBibS96A5rhtGZiIAdAj uDUZ/USNAoqJRxRa50vZkMTO26CsUWVf6epgzF0QU3wAJTcU9ZRoxA5brruRKTfqkdTT 7PvQ== X-Received: by 10.66.248.40 with SMTP id yj8mr3682060pac.95.1369838741582; Wed, 29 May 2013 07:45:41 -0700 (PDT) Received: from localhost.localdomain (pppoe146.47.east.tokyo.dcn.ne.jp. [219.105.47.146]) by mx.google.com with ESMTPSA id zs12sm40209652pab.0.2013.05.29.07.45.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 May 2013 07:45:40 -0700 (PDT) From: Jiang Liu To: Andrew Morton Cc: Jiang Liu , David Rientjes , Wen Congyang , Mel Gorman , Minchan Kim , KAMEZAWA Hiroyuki , Michal Hocko , James Bottomley , Sergei Shtylyov , David Howells , Mark Salter , Jianguo Wu , linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "James E.J. Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH, v2 08/13] mm/PARISC: prepare for killing free_all_bootmem_node() Date: Wed, 29 May 2013 22:44:47 +0800 Message-Id: <1369838692-26860-9-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369838692-26860-1-git-send-email-jiang.liu@huawei.com> References: <1369838692-26860-1-git-send-email-jiang.liu@huawei.com> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Prepare for killing free_all_bootmem_node() by using free_all_bootmem(). Signed-off-by: Jiang Liu Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Michal Hocko Cc: David Rientjes 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(-) 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) {