Commit d0a16fe9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
  ...
parents 76f0f227 fcc16a9e

Documentation/features/core/jump-labels/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    |       nds32: | TODO |

    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |        s390: |  ok  |

Documentation/features/debug/kprobes-on-ftrace/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    |       nds32: | TODO |

    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |        s390: | TODO |

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ config KEXEC_CORE 
	select CRASH_CORE

	bool



config KEXEC_ELF

	bool



config HAVE_IMA_KEXEC

	bool

arch/parisc/Kconfig

+25 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ config PARISC 
	select HAVE_KRETPROBES

	select HAVE_DYNAMIC_FTRACE if $(cc-option,-fpatchable-function-entry=1,1)

	select HAVE_FTRACE_MCOUNT_RECORD if HAVE_DYNAMIC_FTRACE

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS



	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used
@@ -344,6 +346,29 @@ config NR_CPUS 
	depends on SMP

	default "4"



config KEXEC

	bool "Kexec system call"

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

	  but it is independent of the system firmware.   And like a reboot

	  you can start any kernel with it, not just Linux.



	  It is an ongoing process to be certain the hardware in a machine

	  shutdown, so do not be surprised if this code does not

	  initially work for you.



config KEXEC_FILE

	bool "kexec file based system call"

	select KEXEC_CORE

	select KEXEC_ELF

	help

	  This enables the kexec_file_load() System call. This is

	  file based and takes file descriptors as system call argument

	  for kernel and initramfs as opposed to list of segments as

	  accepted by previous system call.



endmenu

arch/parisc/boot/compressed/.gitignore

+2 −0
Original line number Diff line number Diff line 
firmware.c

real2.S

sizes.h

vmlinux

vmlinux.lds

CRA Git | Maintained and supported by SUSTech CRA and CCSE