Commit-ID: 760b61d76da6d6a99eb245ab61abf71ca5415cea Gitweb: http://git.kernel.org/tip/760b61d76da6d6a99eb245ab61abf71ca5415cea Author: Ard Biesheuvel <ard.biesheu...@linaro.org> AuthorDate: Fri, 18 Aug 2017 20:49:35 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 21 Aug 2017 09:43:49 +0200
efi/libstub/arm64: Use hidden attribute for struct screen_info reference To prevent the compiler from emitting absolute references to screen_info when building position independent code, redeclare the symbol with hidden visibility. Tested-by: Matthias Kaehlcke <m...@chromium.org> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Matt Fleming <m...@codeblueprint.co.uk> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: linux-...@vger.kernel.org Link: http://lkml.kernel.org/r/20170818194947.19347-3-ard.biesheu...@linaro.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/arm64/include/asm/efi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 8f3043a..464ac85 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -81,6 +81,9 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, #define alloc_screen_info(x...) &screen_info #define free_screen_info(x...) +/* redeclare as 'hidden' so the compiler will generate relative references */ +extern struct screen_info screen_info __attribute__((__visibility__("hidden"))); + static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt) { }
