android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: drop linker script hack to hide __efistub_ symbols

Browse Source 
Commit 1212f7a16a ("scripts/kallsyms: filter arm64's __efistub_
symbols") updated the kallsyms code to filter out symbols with
the __efistub_ prefix explicitly, so we no longer require the
hack in our linker script to emit them as absolute symbols.

Cc: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Ard Biesheuvel 2018-11-30 12:35:58 +01:00 committed by Will Deacon
parent 1b57ec8c75
commit dd6846d774
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arch/arm64/kernel/image.h
View File

@ -75,16 +75,6 @@
__efistub_stext_offset = stext - _text; __efistub_stext_offset = stext - _text;
/*
* Prevent the symbol aliases below from being emitted into the kallsyms
* table, by forcing them to be absolute symbols (which are conveniently
* ignored by scripts/kallsyms) rather than section relative symbols.
* The distinction is only relevant for partial linking, and only for symbols
* that are defined within a section declaration (which is not the case for
* the definitions below) so the resulting values will be identical.
*/
#define KALLSYMS_HIDE(sym) ABSOLUTE(sym)
/* /*
* The EFI stub has its own symbol namespace prefixed by __efistub_, to * The EFI stub has its own symbol namespace prefixed by __efistub_, to
* isolate it from the kernel proper. The following symbols are legally * isolate it from the kernel proper. The following symbols are legally
@ -94,28 +84,28 @@ __efistub_stext_offset = stext - _text;
* linked at. The routines below are all implemented in assembler in a * linked at. The routines below are all implemented in assembler in a
* position independent manner * position independent manner
*/ */
__efistub_memcmp = KALLSYMS_HIDE(__pi_memcmp); __efistub_memcmp = __pi_memcmp;
__efistub_memchr = KALLSYMS_HIDE(__pi_memchr); __efistub_memchr = __pi_memchr;
__efistub_memcpy = KALLSYMS_HIDE(__pi_memcpy); __efistub_memcpy = __pi_memcpy;
__efistub_memmove = KALLSYMS_HIDE(__pi_memmove); __efistub_memmove = __pi_memmove;
__efistub_memset = KALLSYMS_HIDE(__pi_memset); __efistub_memset = __pi_memset;
__efistub_strlen = KALLSYMS_HIDE(__pi_strlen); __efistub_strlen = __pi_strlen;
__efistub_strnlen = KALLSYMS_HIDE(__pi_strnlen); __efistub_strnlen = __pi_strnlen;
__efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp); __efistub_strcmp = __pi_strcmp;
__efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp); __efistub_strncmp = __pi_strncmp;
__efistub_strrchr = KALLSYMS_HIDE(__pi_strrchr); __efistub_strrchr = __pi_strrchr;
__efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area); __efistub___flush_dcache_area = __pi___flush_dcache_area;
#ifdef CONFIG_KASAN #ifdef CONFIG_KASAN
__efistub___memcpy = KALLSYMS_HIDE(__pi_memcpy); __efistub___memcpy = __pi_memcpy;
__efistub___memmove = KALLSYMS_HIDE(__pi_memmove); __efistub___memmove = __pi_memmove;
__efistub___memset = KALLSYMS_HIDE(__pi_memset); __efistub___memset = __pi_memset;
#endif #endif
__efistub__text = KALLSYMS_HIDE(_text); __efistub__text = _text;
__efistub__end = KALLSYMS_HIDE(_end); __efistub__end = _end;
__efistub__edata = KALLSYMS_HIDE(_edata); __efistub__edata = _edata;
__efistub_screen_info = KALLSYMS_HIDE(screen_info); __efistub_screen_info = screen_info;
#endif #endif