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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 940EEC433FF for ; Tue, 6 Aug 2019 21:40:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C77121874 for ; Tue, 6 Aug 2019 21:40:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127610; bh=dHVXNDpoZJBQgbCoqnc5CubuqJm691Zj78VIHeZR10c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jPjH347Yi9R0STN/qSZ+B3kg0TgztGYZeCo3BVAkN8QMt2q8ibtp6Njev9TXa7kgH I+RbZcQpPfoLYXGEAS9MxlsuWyx4KiJ7Ccv/HlJtlpvTqTHMNYKVelYSY6ZF2CBfFa wbYpeGps8z+bsG719UpwPwLCNvgxspamkvt4pgWo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729206AbfHFVhD (ORCPT ); Tue, 6 Aug 2019 17:37:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:54826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729196AbfHFVhC (ORCPT ); Tue, 6 Aug 2019 17:37:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD674217F5; Tue, 6 Aug 2019 21:37:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127422; bh=dHVXNDpoZJBQgbCoqnc5CubuqJm691Zj78VIHeZR10c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yswSeP0lV4EYVpmUyWuwOgJm5p8sjm42jTMxF2HWbDg8Afe08ogk0dAOX8YRFaDoD 4HoQRd/VS8jTV11nY/cLm7fxlOxvnDK0Lw4nYziUeyaswd+GOG94u7oDyEKfVQ+sUo UhRLjaY1FAVkT4zivkhqSt2UbQKURYCBoMRVTo6Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qian Cai , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL 4.14 19/25] arm64/mm: fix variable 'pud' set but not used Date: Tue, 6 Aug 2019 17:36:16 -0400 Message-Id: <20190806213624.20194-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213624.20194-1-sashal@kernel.org> References: <20190806213624.20194-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qian Cai [ Upstream commit 7d4e2dcf311d3b98421d1f119efe5964cafa32fc ] GCC throws a warning, arch/arm64/mm/mmu.c: In function 'pud_free_pmd_page': arch/arm64/mm/mmu.c:1033:8: warning: variable 'pud' set but not used [-Wunused-but-set-variable] pud_t pud; ^~~ because pud_table() is a macro and compiled away. Fix it by making it a static inline function and for pud_sect() as well. Signed-off-by: Qian Cai Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index ee77556b01243..4cf248185e6f9 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -394,8 +394,8 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, PMD_TYPE_SECT) #if defined(CONFIG_ARM64_64K_PAGES) || CONFIG_PGTABLE_LEVELS < 3 -#define pud_sect(pud) (0) -#define pud_table(pud) (1) +static inline bool pud_sect(pud_t pud) { return false; } +static inline bool pud_table(pud_t pud) { return true; } #else #define pud_sect(pud) ((pud_val(pud) & PUD_TYPE_MASK) == \ PUD_TYPE_SECT) -- 2.20.1