diff options
| author | Qian Cai <cai@lca.pw> | 2019-07-30 17:23:48 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-25 10:47:56 +0200 |
| commit | ffb1a76d1c29435e0c1e0ca16fd21bb37969ae60 (patch) | |
| tree | 194594da8555e4858ba479d8de575a4f0a84d219 /arch/arm64 | |
| parent | 48522289bf50cdeab90ef2c5cc6e998c513e2a4c (diff) | |
| download | linux-stable-ffb1a76d1c29435e0c1e0ca16fd21bb37969ae60.tar.gz linux-stable-ffb1a76d1c29435e0c1e0ca16fd21bb37969ae60.tar.bz2 linux-stable-ffb1a76d1c29435e0c1e0ca16fd21bb37969ae60.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/arm64')
| -rw-r--r-- | arch/arm64/include/asm/efi.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 7ed320895d1f..f52a2968a3b6 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -94,7 +94,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, ((protocol##_t *)instance)->f(instance, ##__VA_ARGS__) #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"))); |