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=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 67289C433FF for ; Tue, 6 Aug 2019 21:39:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E9302189E for ; Tue, 6 Aug 2019 21:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127563; bh=mX7KElrI02fArXyDhlXVSIrzOeX6Zeft/TCqFwBzzpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ewm3SJcJV3Riwc4oyTyXpitcs0XNI+13I6it3AVo1o593rEdLViABWk1/oCNgnYQe HObaZOqVbI20a/yRZHenCj3JXuAiE+4Tes1HnUMmfSz4Lk7+A7P6Hk+zQqDpBAkltW xmbx6bJmVg9Bvh28QiEScVcyjjuTbxFMLCeNYJIk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729443AbfHFVhi (ORCPT ); Tue, 6 Aug 2019 17:37:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:55362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729397AbfHFVhg (ORCPT ); Tue, 6 Aug 2019 17:37:36 -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 C90CF21873; Tue, 6 Aug 2019 21:37:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127455; bh=mX7KElrI02fArXyDhlXVSIrzOeX6Zeft/TCqFwBzzpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zt7lHW34SDnk8Wb4XFftqI2EtERQ7V5jSgy52qe1KZtCifQ2fNMSCiLviYZewf19N MPCYpUh7dOgk0YVJER/cPud5Nu/1g+xgM3m/n3Ehrzr/0LuzjrrALpKtdEs/5YM90X qNRtPjUGeDv/B9d3ME4i8RccjZGRRqL+Cl5x7gco= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qian Cai , Will Deacon , Catalin Marinas , Sasha Levin , linux-efi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 11/17] arm64/efi: fix variable 'si' set but not used Date: Tue, 6 Aug 2019 17:37:08 -0400 Message-Id: <20190806213715.20487-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213715.20487-1-sashal@kernel.org> References: <20190806213715.20487-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qian Cai [ Upstream commit f1d4836201543e88ebe70237e67938168d5fab19 ] GCC throws out this warning on arm64. drivers/firmware/efi/libstub/arm-stub.c: In function 'efi_entry': drivers/firmware/efi/libstub/arm-stub.c:132:22: warning: variable 'si' set but not used [-Wunused-but-set-variable] Fix it by making free_screen_info() a static inline function. Acked-by: Will Deacon Signed-off-by: Qian Cai Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/include/asm/efi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 65615820155e6..65db124a44bff 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -52,7 +52,11 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); #define efi_is_64bit() (true) #define alloc_screen_info(x...) &screen_info -#define free_screen_info(x...) + +static inline void free_screen_info(efi_system_table_t *sys_table_arg, + struct screen_info *si) +{ +} /* redeclare as 'hidden' so the compiler will generate relative references */ extern struct screen_info screen_info __attribute__((__visibility__("hidden"))); -- 2.20.1