Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton: - various hotfixes - kexec_file updates and feature work * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (27 commits) kernel/kexec_file.c: move purgatories sha256 to common code kernel/kexec_file.c: allow archs to set purgatory load address kernel/kexec_file.c: remove mis-use of sh_offset field during purgatory load kernel/kexec_file.c: remove unneeded variables in kexec_purgatory_setup_sechdrs kernel/kexec_file.c: remove unneeded for-loop in kexec_purgatory_setup_sechdrs kernel/kexec_file.c: split up __kexec_load_puragory kernel/kexec_file.c: use read-only sections in arch_kexec_apply_relocations* kernel/kexec_file.c: search symbols in read-only kexec_purgatory kernel/kexec_file.c: make purgatory_info->ehdr const kernel/kexec_file.c: remove checks in kexec_purgatory_load include/linux/kexec.h: silence compile warnings kexec_file, x86: move re-factored code to generic side x86: kexec_file: clean up prepare_elf64_headers() x86: kexec_file: lift CRASH_MAX_RANGES limit on crash_mem buffer x86: kexec_file: remove X86_64 dependency from prepare_elf64_headers() x86: kexec_file: purge system-ram walking from prepare_elf64_headers() kexec_file,x86,powerpc: factor out kexec_file_ops functions kexec_file: make use of purgatory optional proc: revalidate misc dentries mm, slab: reschedule cache_reap() on the same CPU ...
Showing
- arch/mips/mm/gup.c 2 additions, 0 deletionsarch/mips/mm/gup.c
- arch/powerpc/Kconfig 3 additions, 0 deletionsarch/powerpc/Kconfig
- arch/powerpc/include/asm/kexec.h 1 addition, 1 deletionarch/powerpc/include/asm/kexec.h
- arch/powerpc/kernel/kexec_elf_64.c 6 additions, 5 deletionsarch/powerpc/kernel/kexec_elf_64.c
- arch/powerpc/kernel/machine_kexec_file_64.c 3 additions, 36 deletionsarch/powerpc/kernel/machine_kexec_file_64.c
- arch/s390/mm/gup.c 2 additions, 0 deletionsarch/s390/mm/gup.c
- arch/sh/mm/gup.c 2 additions, 0 deletionsarch/sh/mm/gup.c
- arch/sparc/mm/gup.c 4 additions, 0 deletionsarch/sparc/mm/gup.c
- arch/x86/Kconfig 3 additions, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/kexec-bzimage64.h 1 addition, 1 deletionarch/x86/include/asm/kexec-bzimage64.h
- arch/x86/kernel/crash.c 62 additions, 272 deletionsarch/x86/kernel/crash.c
- arch/x86/kernel/kexec-bzimage64.c 5 additions, 5 deletionsarch/x86/kernel/kexec-bzimage64.c
- arch/x86/kernel/machine_kexec_64.c 28 additions, 83 deletionsarch/x86/kernel/machine_kexec_64.c
- arch/x86/purgatory/Makefile 3 additions, 0 deletionsarch/x86/purgatory/Makefile
- arch/x86/purgatory/purgatory.c 1 addition, 1 deletionarch/x86/purgatory/purgatory.c
- arch/x86/purgatory/string.c 12 additions, 0 deletionsarch/x86/purgatory/string.c
- fs/proc/generic.c 22 additions, 1 deletionfs/proc/generic.c
- include/linux/kexec.h 53 additions, 28 deletionsinclude/linux/kexec.h
- include/linux/sha256.h 10 additions, 1 deletioninclude/linux/sha256.h
- ipc/shm.c 20 additions, 3 deletionsipc/shm.c
Loading
Please register or sign in to comment