diff options
| author | Rob Herring <robh@kernel.org> | 2018-03-01 17:12:07 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-03-05 20:45:38 +0100 |
| commit | fdfb69a72522e97f9105a6d39a5be0a465951ed8 (patch) | |
| tree | c9491dfde5f0ba8f6dafdacce30279e5f9cb4d87 | |
| parent | ARM: boot: add strrchr function (diff) | |
| download | linux-fdfb69a72522e97f9105a6d39a5be0a465951ed8.tar.xz linux-fdfb69a72522e97f9105a6d39a5be0a465951ed8.zip | |
arm64/efi: Make strrchr() available to the EFI namespace
libfdt gained a new dependency on strrchr, so make it available to the
EFI namespace before we update libfdt.
Thanks to Ard for providing this fix.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | arch/arm64/kernel/image.h | 1 | ||||
| -rw-r--r-- | arch/arm64/lib/strrchr.S | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index c7fcb232fe47..a820ed07fb80 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -103,6 +103,7 @@ __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_strrchr = KALLSYMS_HIDE(__pi_strrchr); __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area); #ifdef CONFIG_KASAN diff --git a/arch/arm64/lib/strrchr.S b/arch/arm64/lib/strrchr.S index 61eabd9a289a..f8e2784d5752 100644 --- a/arch/arm64/lib/strrchr.S +++ b/arch/arm64/lib/strrchr.S @@ -40,4 +40,4 @@ ENTRY(strrchr) b 1b 2: mov x0, x3 ret -ENDPROC(strrchr) +ENDPIPROC(strrchr) |