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

Commit 7f4e3462 authored by Thierry Reding's avatar Thierry Reding Committed by Will Deacon
Browse files

arm64/efi: Make strnlen() available to the EFI namespace 



Changes introduced in the upstream version of libfdt pulled in by commit
91feabc2 ("scripts/dtc: Update to upstream commit b06e55c88b9b") use
the strnlen() function, which isn't currently available to the EFI name-
space. Add it to the EFI namespace to avoid a linker error.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Rob Herring <robh@kernel.org>
Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent bee038a4

arch/arm64/kernel/image.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ __efistub_memcpy = KALLSYMS_HIDE(__pi_memcpy); 
__efistub_memmove		= KALLSYMS_HIDE(__pi_memmove);

__efistub_memset		= KALLSYMS_HIDE(__pi_memset);

__efistub_strlen		= KALLSYMS_HIDE(__pi_strlen);

__efistub_strnlen		= KALLSYMS_HIDE(__pi_strnlen);

__efistub_strcmp		= KALLSYMS_HIDE(__pi_strcmp);

__efistub_strncmp		= KALLSYMS_HIDE(__pi_strncmp);

__efistub___flush_dcache_area	= KALLSYMS_HIDE(__pi___flush_dcache_area);

arch/arm64/lib/strnlen.S

+1 −1
Original line number Diff line number Diff line
@@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ 
.Lhit_limit:

	mov	len, limit

	ret

ENDPROC(strnlen)
 
ENDPIPROC(strnlen)