Merge branch 'for-next/kexec' into aarch64/for-next/core
Merge in kexec_file_load() support from Akashi Takahiro.
Showing
- arch/arm64/Kconfig 33 additions, 0 deletionsarch/arm64/Kconfig
- arch/arm64/include/asm/cpufeature.h 48 additions, 0 deletionsarch/arm64/include/asm/cpufeature.h
- arch/arm64/include/asm/image.h 59 additions, 0 deletionsarch/arm64/include/asm/image.h
- arch/arm64/include/asm/kexec.h 19 additions, 0 deletionsarch/arm64/include/asm/kexec.h
- arch/arm64/kernel/Makefile 2 additions, 1 deletionarch/arm64/kernel/Makefile
- arch/arm64/kernel/cpu-reset.S 4 additions, 4 deletionsarch/arm64/kernel/cpu-reset.S
- arch/arm64/kernel/head.S 2 additions, 1 deletionarch/arm64/kernel/head.S
- arch/arm64/kernel/image.h 13 additions, 8 deletionsarch/arm64/kernel/image.h
- arch/arm64/kernel/kexec_image.c 130 additions, 0 deletionsarch/arm64/kernel/kexec_image.c
- arch/arm64/kernel/machine_kexec.c 10 additions, 2 deletionsarch/arm64/kernel/machine_kexec.c
- arch/arm64/kernel/machine_kexec_file.c 223 additions, 0 deletionsarch/arm64/kernel/machine_kexec_file.c
- arch/arm64/kernel/relocate_kernel.S 2 additions, 1 deletionarch/arm64/kernel/relocate_kernel.S
- arch/powerpc/kernel/machine_kexec_file_64.c 0 additions, 54 deletionsarch/powerpc/kernel/machine_kexec_file_64.c
- arch/s390/kernel/machine_kexec_file.c 0 additions, 10 deletionsarch/s390/kernel/machine_kexec_file.c
- include/linux/kexec.h 9 additions, 2 deletionsinclude/linux/kexec.h
- include/linux/pe.h 1 addition, 1 deletioninclude/linux/pe.h
- include/uapi/asm-generic/unistd.h 3 additions, 1 deletioninclude/uapi/asm-generic/unistd.h
- kernel/kexec_file.c 65 additions, 5 deletionskernel/kexec_file.c
Loading
Please register or sign in to comment