summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorQian Cai <cai@lca.pw>2019-07-30 17:23:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-25 10:51:47 +0200
commit7796efd65eb333d3ae266910c8094145509b5694 (patch)
tree14307297f63a42d32dcfa55b11533c8f6d043077 /arch
parent1c335cd18ced56dfe9470375c34199635da9dd9c (diff)
downloadlinux-7796efd65eb333d3ae266910c8094145509b5694.tar.gz
linux-7796efd65eb333d3ae266910c8094145509b5694.tar.bz2
linux-7796efd65eb333d3ae266910c8094145509b5694.zip
arm64/efi: fix variable 'si' set but not used
[ 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 <will@kernel.org> Signed-off-by: Qian Cai <cai@lca.pw> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/efi.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
index 65615820155e..65db124a44bf 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")));