Message ID | 1459349164-27175-3-git-send-email-ard.biesheuvel@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B9CE49FC5B for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 30 Mar 2016 14:48:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E18C620386 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 30 Mar 2016 14:48:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DEE220374 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 30 Mar 2016 14:48:40 +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 1alHOj-0000EE-QB; Wed, 30 Mar 2016 14:47:05 +0000 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1alHOK-00084D-7i for linux-arm-kernel@lists.infradead.org; Wed, 30 Mar 2016 14:46:42 +0000 Received: by mail-wm0-x229.google.com with SMTP id 20so74632003wmh.1 for <linux-arm-kernel@lists.infradead.org>; Wed, 30 Mar 2016 07:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6cQS0i9SIcImPxvklcToibSgfZh6vmK1Qrw9eEEZvPI=; b=PmDE+P4bXPhQz8Un1RFJ/iCMlvUblwEowvTIFXNwlfl8C4D2K2yyrShTW8S1zCWgGz 5NQc5FNFLeiBmkrDv8KeriXp9eNDlRAAu94cniZnTme7LKUTid2euP1mG3O6A3v1y5OV sjdxACBwfRDoF2fpJURwRwo22z1bj6oWLT1IM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6cQS0i9SIcImPxvklcToibSgfZh6vmK1Qrw9eEEZvPI=; b=JeoygCg2MnmS5jhKuZ3ouvNQ2Tl/l8F6Pt3S1DZf/Om5RfDtbkFKPqPMnlR+hM0dsq iQpShfRN/IzHQ5Kdw5eOyFhOvNlKeU2tz1DLquzNRHZGMRoevTv59LjsIR+ZrTwZbDaN ALEL/3ffT3JLR9m76/DfOgo1Uzs0P9Zk6QCpM0X+lT2icOiyQkUoScIm5CGMrLETYpw2 AMrh4o8z+twkvCJHhBaPAqekaayn0btHRWRItXyDvzu3wYxBIoMWHnAn0x9eYu1l54kR R83f35uI4LX3VB7LkMeCXaKfCPLZoFFJEBx1ODFkw/PyMp7BsDFGNb/BPy9MiE3+Tmn/ bF6g== X-Gm-Message-State: AD7BkJLcA4cMkMb9j08zoE//5zI9W98dOR23Q3wqdVWiXtBYZe4/3ybeLy5bGcHCTTLFbHNd X-Received: by 10.28.5.85 with SMTP id 82mr4421691wmf.26.1459349178521; Wed, 30 Mar 2016 07:46:18 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id i5sm4325336wjx.15.2016.03.30.07.46.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 07:46:17 -0700 (PDT) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-mm@kvack.org, akpm@linux-foundation.org, nios2-dev@lists.rocketboards.org, lftan@altera.com, jonas@southpole.se, linux@lists.openrisc.net Subject: [PATCH v2 2/9] arm64: mm: free __init memory via the linear mapping Date: Wed, 30 Mar 2016 16:45:57 +0200 Message-Id: <1459349164-27175-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459349164-27175-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459349164-27175-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160330_074640_555373_6A28142B X-CRM114-Status: GOOD ( 12.49 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: mark.rutland@arm.com, steve.capper@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 |
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 82ced5fa1e66..89376f3c65a3 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -452,7 +452,8 @@ void __init mem_init(void) void free_initmem(void) { - free_initmem_default(0); + free_reserved_area(__va(__pa(__init_begin)), __va(__pa(__init_end)), + 0, "unused kernel"); fixup_init(); }
The implementation of free_initmem_default() expects __init_begin and __init_end to be covered by the linear mapping, which is no longer the case. So open code it instead, using addresses that are explicitly translated from kernel virtual to linear virtual. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)