From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3537C433B4 for ; Tue, 18 May 2021 12:17:45 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FAAB60FF1 for ; Tue, 18 May 2021 12:17:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FAAB60FF1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc:To:From: References:In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vyQ/YRDFKtB17tZipiNd5VSuJGCuh9XZDRBJdLyeUBM=; b=pIBOu0j0by476EcpFn3TEne1y ukhkB3T0DWu+iQ/JiGZcQtOHU82MBnMcCuxU5kPE89I/tep1rj4VGBENBy+8PVCvPrDxItQbcKgsc StCsTbWMlh0yJ1FlYZALor3SwEQpdVe1+WWGbMLMpTeSTuKn4ILjIzCj7Lm2aBAkon8jzi30WZOeR bGWNmxZxaqCQSIVc8XsOH7WYSBiOtYIm05yoVCLqxxDBndOSLZXDLwfvDrUAqAlYq0KAtTGgMsmhU 5OiOY6ObHIZhzrRY0kYtfJTma/faNo1MXJq0YpTzGtSxpnF1zUSDx/U/FtYVJz6yPmaNrYNERrv6o Wj3hdEWKw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liydw-000j4d-Pb; Tue, 18 May 2021 12:16:12 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liydg-000j1J-3D for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 12:15:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description; bh=tXsdohr9dsfiFfYjt4EoeiJaXMMYDvnBILSMVxKeA40=; b=L43nH3Z0xdoluaDfNib5tVgyHc yGpKXF5NkUFVzhY9MxOHDi32+7czemhi1Kk1wen16zflWG77xVWU5xFK440q6SCeRASSE+I0tnmdK qvMvw2HrFaKaNSgSL6bCvRazw90nwS5E6rXHw04EHar8Ayru1M0SlzmdDgnlwCLVMfGkO8WuIZHou ii1YVdmqORVfOPwU+ro25kA5AJKUJzyIdwom1jE7wR9BXX1UagVfAFfDqnrtZsGteNSYZuCIwu2dY GLLGmfWhBJPukKnZE7YHgPtFtSVyuMke/+FmPZg8Zg8Br5J3fczTC8CLm4RNrsB72f4v6LadW3Ftp u2ChdxKg==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liydd-00Edo8-Lx for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 12:15:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=tXsdohr9dsfiFfYjt4EoeiJaXMMYDvnBILSMVxKeA40=; b=ntVXk9vQhlEMBA3K6nALoQffR3 5o0C1XtG5gRZ/dgoOY1q2bKmOgyvvS+hffoJ3k8M/L9FhPE+y7BzQ/hl6uj7lic9+4/2m+/oJOKis pOxZyGYuNQzwqcbOGqLUvJSZRT2RxeKqr20yL2ouVjH7Z1EYn55qVRcaySvuj3uXdBDCHmOQwzgAe psEAd7bqPUssNGTf/22hUGiGWN63Mjy6wMN+9pAhrSwzLbMEr2phgd0eEDz9hDaI8uLFS1qZoFxWs LmcN7KboonS5jokv28+aGXmaIQy9nRuyc3uiPVdReRgYg1w10b/G2plrQ83mvv4KHVRjSnBAuLCRM qmtyXQSQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:55066 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1liyda-0004H8-Sc; Tue, 18 May 2021 13:15:50 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1liyda-0005B4-Kk; Tue, 18 May 2021 13:15:50 +0100 In-Reply-To: <20210518120633.GW12395@shell.armlinux.org.uk> References: <20210518120633.GW12395@shell.armlinux.org.uk> From: "Russell King (Oracle)" To: Yanfei Xu Cc: rppt@kernel.org, ardb@kernel.org, linus.walleij@linaro.org, akpm@linux-foundation.org, carver4lio@163.com, tiantao6@hisilicon.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] ARM: change vmalloc_min to vmalloc_start MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 18 May 2021 13:15:50 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_051553_740797_F8AC0DAE X-CRM114-Status: GOOD ( 13.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Change the current vmalloc_min, which is supposed to be the lowest address of vmalloc space including the VMALLOC_OFFSET, to vmalloc_start which does not include VMALLOC_OFFSET. Signed-off-by: Russell King (Oracle) --- arch/arm/mm/mmu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index d932c46a02e0..457203b41ceb 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1123,8 +1123,7 @@ void __init debug_ll_io_init(void) } #endif -static unsigned long __initdata vmalloc_min = - VMALLOC_END - (240 << 20) - VMALLOC_OFFSET; +static unsigned long __initdata vmalloc_start = VMALLOC_END - (240 << 20); /* * vmalloc=size forces the vmalloc area to be exactly 'size' @@ -1142,14 +1141,14 @@ static int __init early_vmalloc(char *arg) vmalloc_reserve >> 20); } - vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M); + vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M + VMALLOC_OFFSET); if (vmalloc_reserve > vmalloc_max) { vmalloc_reserve = vmalloc_max; pr_warn("vmalloc area is too big, limiting to %luMB\n", vmalloc_reserve >> 20); } - vmalloc_min = VMALLOC_END - vmalloc_reserve; + vmalloc_start = VMALLOC_END - vmalloc_reserve; return 0; } early_param("vmalloc", early_vmalloc); @@ -1169,7 +1168,8 @@ void __init adjust_lowmem_bounds(void) * and may itself be outside the valid range for which phys_addr_t * and therefore __pa() is defined. */ - vmalloc_limit = (u64)vmalloc_min - PAGE_OFFSET + PHYS_OFFSET; + vmalloc_limit = (u64)vmalloc_start - + (PAGE_OFFSET + PHYS_OFFSET + VMALLOC_OFFSET); /* * The first usable region must be PMD aligned. Mark its start -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel