Merge branch 'parisc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

Pull parisc updates from Helge Deller:

 - Make the powerpc implementation to read elf files available as a
   public kexec interface so it can be re-used on other architectures
   (Sven)

 - Implement kexec on parisc (Sven)

 - Add kprobes on ftrace on parisc (Sven)

 - Fix kernel crash with HSC-PCI cards based on card-mode Dino

 - Add assembly implementations for memset, strlen, strcpy, strncpy and
   strcat

 - Some cleanups, documentation updates, warning fixes, ...

* 'parisc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: (25 commits)
  parisc: Have git ignore generated real2.S and firmware.c
  parisc: Disable HP HSC-PCI Cards to prevent kernel crash
  parisc: add support for kexec_file_load() syscall
  parisc: wire up kexec_file_load syscall
  parisc: add kexec syscall support
  parisc: add __pdc_cpu_rendezvous()
  kprobes/parisc: remove arch_kprobe_on_func_entry()
  kexec_elf: support 32 bit ELF files
  kexec_elf: remove unused variable in kexec_elf_load()
  kexec_elf: remove Elf_Rel macro
  kexec_elf: remove PURGATORY_STACK_SIZE
  kexec_elf: remove parsing of section headers
  kexec_elf: change order of elf_*_to_cpu() functions
  kexec: add KEXEC_ELF
  parisc: Save some bytes in dino driver
  parisc: Drop comments which are already in pci.h
  parisc: Convert eisa_enumerator to use pr_cont()
  parisc: Avoid warning when loading hppb driver
  parisc: speed up flush_tlb_all_local with qemu
  parisc: Add ALTERNATIVE_CODE() and ALT_COND_RUN_ON_QEMU
  ...

diff --combined arch/Kconfig
index aa6bdb3df5c172bd1a63de57420e8a04241d7d55,01244412f393f2d80de6c7783d2d6f18c59229b8..71d9ae0c0ea16ea8990e1a81841d5bb31b77a07d
--- 1/arch/Kconfig
--- 2/arch/Kconfig
+++ b/arch/Kconfig
@@@ -18,6 -18,9 +18,9 @@@ config KEXEC_COR
        select CRASH_CORE
        bool
  
+ config KEXEC_ELF
+       bool
+ 
  config HAVE_IMA_KEXEC
        bool
  
@@@ -925,20 -928,6 +928,20 @@@ config LOCK_EVENT_COUNT
          the chance of application behavior change because of timing
          differences. The counts are reported via debugfs.
  
 +# Select if the architecture has support for applying RELR relocations.
 +config ARCH_HAS_RELR
 +      bool
 +
 +config RELR
 +      bool "Use RELR relocation packing"
 +      depends on ARCH_HAS_RELR && TOOLS_SUPPORT_RELR
 +      default y
 +      help
 +        Store the kernel's dynamic relocations in the RELR relocation packing
 +        format. Requires a compatible linker (LLD supports this feature), as
 +        well as compatible NM and OBJCOPY utilities (llvm-nm and llvm-objcopy
 +        are compatible).
 +
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"

diff --combined arch/powerpc/Kconfig
index d8dcd8820369eb4be85e4493bf325779f3645e5f,3c85ef27033854c094655b55c1337437f44940df..891cd23f9c8b054cc6c813bd5fd0e47e510d8f2a
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -121,6 -121,7 +121,6 @@@ config PP
        select ARCH_32BIT_OFF_T if PPC32
        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEVMEM_IS_ALLOWED
 -      select ARCH_HAS_DMA_MMAP_PGPROT
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_GCOV_PROFILE_ALL
@@@ -511,6 -512,7 +511,7 @@@ config KEXEC_FIL
        select KEXEC_CORE
        select HAVE_IMA_KEXEC
        select BUILD_BIN2C
+       select KEXEC_ELF
        depends on PPC64
        depends on CRYPTO=y
        depends on CRYPTO_SHA256=y

diff --combined kernel/Makefile
index ef0d95a190b4179848c52041f2d1cfb6b9fbff77,002220b7ca7c908d04a763fe2760ac8eb5f90186..48c5376d290a64b0e3f7cd8f87e4f4e5ff811f3e
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -64,6 -64,7 +64,7 @@@ obj-$(CONFIG_CRASH_CORE) += crash_core.
  obj-$(CONFIG_KEXEC_CORE) += kexec_core.o
  obj-$(CONFIG_KEXEC) += kexec.o
  obj-$(CONFIG_KEXEC_FILE) += kexec_file.o
+ obj-$(CONFIG_KEXEC_ELF) += kexec_elf.o
  obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o
  obj-$(CONFIG_COMPAT) += compat.o
  obj-$(CONFIG_CGROUPS) += cgroup/
@@@ -111,6 -112,7 +112,6 @@@ obj-$(CONFIG_CONTEXT_TRACKING) += conte
  obj-$(CONFIG_TORTURE_TEST) += torture.o
  
  obj-$(CONFIG_HAS_IOMEM) += iomem.o
 -obj-$(CONFIG_ZONE_DEVICE) += memremap.o
  obj-$(CONFIG_RSEQ) += rseq.o
  
  obj-$(CONFIG_GCC_PLUGIN_STACKLEAK) += stackleak.o