From patchwork Fri Sep 12 10:05:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Yalin" X-Patchwork-Id: 4893521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C1C8CBEEA5 for ; Fri, 12 Sep 2014 10:14:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B17F20357 for ; Fri, 12 Sep 2014 10:14:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C2C520353 for ; Fri, 12 Sep 2014 10:14:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSNqF-0002g9-Nu; Fri, 12 Sep 2014 10:12:35 +0000 Received: from cnbjrel01.sonyericsson.com ([219.141.167.165]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSNqD-0002c3-Hy for linux-arm-kernel@lists.infradead.org; Fri, 12 Sep 2014 10:12:34 +0000 From: "Wang, Yalin" To: 'Will Deacon' , "'linux@arm.linux.org.uk'" , "'linux-kernel@vger.kernel.org'" , "'linux-arm-kernel@lists.infradead.org'" , "'linux-mm@kvack.org'" Date: Fri, 12 Sep 2014 18:05:04 +0800 Subject: [PATCH] arm:free_initrd_mem should also free the memblock Thread-Topic: [PATCH] arm:free_initrd_mem should also free the memblock Thread-Index: Ac/OcQYK+iHegZKaRzKAERxvRcdQnQ== Message-ID: <35FD53F367049845BC99AC72306C23D103CDBFBFB028@CNBJMBX05.corpusers.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140912_031233_759705_8375CC3A X-CRM114-Status: UNSURE ( 7.48 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.2 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP this patch fix the memblock statics for memblock in file /sys/kernel/debug/memblock/reserved if we don't call memblock_free the initrd will still be marked as reserved, even they are freed. Signed-off-by: Yalin Wang --- arch/arm/mm/init.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 659c75d..7bc8e5b 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -638,6 +638,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) if (!keep_initrd) { poison_init_mem((void *)start, PAGE_ALIGN(end) - start); free_reserved_area((void *)start, (void *)end, -1, "initrd"); + memblock_free(__pa(start), end - start); } }