Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61d920c3 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Greg Kroah-Hartman
Browse files

efi/libstub/arm64: Use hidden attribute for struct screen_info reference 



commit 760b61d76da6d6a99eb245ab61abf71ca5415cea upstream.

To prevent the compiler from emitting absolute references to screen_info
when building position independent code, redeclare the symbol with hidden
visibility.

Tested-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20170818194947.19347-3-ard.biesheuvel@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78e96f64

arch/arm64/include/asm/efi.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#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)

{

}