diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-10 18:57:17 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 18:57:17 +0000 |
| commit | d34664f63bba9c884920d86ab67379a08a4ee8e9 (patch) | |
| tree | d35143f376ab6666976ef84b23cf7848a945c7ca /arch/s390 | |
| parent | bc84a2d106beab6000223b569c3bcb9ebf49d9ec (diff) | |
| parent | 394135c1ff13ec9b5a38a36bbdb5811f2f595e94 (diff) | |
| download | lwn-d34664f63bba9c884920d86ab67379a08a4ee8e9.tar.gz lwn-d34664f63bba9c884920d86ab67379a08a4ee8e9.zip | |
Merge branch 'for-next/kexec' into aarch64/for-next/core
Merge in kexec_file_load() support from Akashi Takahiro.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/machine_kexec_file.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c index f413f57f8d20..32023b4f9dc0 100644 --- a/arch/s390/kernel/machine_kexec_file.c +++ b/arch/s390/kernel/machine_kexec_file.c @@ -134,16 +134,6 @@ int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data, return ret; } -/* - * The kernel is loaded to a fixed location. Turn off kexec_locate_mem_hole - * and provide kbuf->mem by hand. - */ -int arch_kexec_walk_mem(struct kexec_buf *kbuf, - int (*func)(struct resource *, void *)) -{ - return 1; -} - int arch_kexec_apply_relocations_add(struct purgatory_info *pi, Elf_Shdr *section, const Elf_Shdr *relsec, |