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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Changes introduced in the upstream version of libfdt pulled in by commit
91feabc2e224 ("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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

authored by

Thierry Reding and committed by

Will Deacon 10 years ago 7f4e3462 bee038a4

+2 -1

2 changed files

expand all

arch

arm64

kernel

image.h

lib

strnlen.S

arch/arm64/kernel/image.h

··· 89 89 __efistub_memmove = KALLSYMS_HIDE(__pi_memmove); 90 90 __efistub_memset = KALLSYMS_HIDE(__pi_memset); 91 91 __efistub_strlen = KALLSYMS_HIDE(__pi_strlen); 92 + __efistub_strnlen = KALLSYMS_HIDE(__pi_strnlen); 92 93 __efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp); 93 94 __efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp); 94 95 __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area);

+1 -1

arch/arm64/lib/strnlen.S

··· 168 168 .Lhit_limit: 169 169 mov len, limit 170 170 ret 171 - ENDPROC(strnlen) 171 + ENDPIPROC(strnlen)