diff options
| author | Philipp Rudo <prudo@linux.ibm.com> | 2019-03-07 12:48:03 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2019-04-29 10:43:59 +0200 |
| commit | 8e4964261374aaec9f4a83de076ceb11c8cdc044 (patch) | |
| tree | 8df575c5d36b1ecf3188151787bfddd080738f56 /arch/s390/include/asm/kexec.h | |
| parent | d0d249d75dda1b101624316a52d117be07b8ccff (diff) | |
| download | linux-stable-8e4964261374aaec9f4a83de076ceb11c8cdc044.tar.gz linux-stable-8e4964261374aaec9f4a83de076ceb11c8cdc044.tar.bz2 linux-stable-8e4964261374aaec9f4a83de076ceb11c8cdc044.zip | |
s390/kexec_file: Unify loader code
s390_image_load and s390_elf_load have the same code to load the different
components. Combine this functionality in one shared function.
While at it move kexec_file_update_kernel into the new function as well.
Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/kexec.h')
| -rw-r--r-- | arch/s390/include/asm/kexec.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h index 08dc2b74858d..a38a57ec6d8f 100644 --- a/arch/s390/include/asm/kexec.h +++ b/arch/s390/include/asm/kexec.h @@ -59,13 +59,9 @@ struct s390_load_data { size_t memsz; }; -int kexec_file_add_purgatory(struct kimage *image, - struct s390_load_data *data); -int kexec_file_add_initrd(struct kimage *image, - struct s390_load_data *data, - char *initrd, unsigned long initrd_len); -int *kexec_file_update_kernel(struct kimage *iamge, - struct s390_load_data *data); +void *kexec_file_add_components(struct kimage *image, + int (*add_kernel)(struct kimage *image, + struct s390_load_data *data)); extern const struct kexec_file_ops s390_kexec_image_ops; extern const struct kexec_file_ops s390_kexec_elf_ops; |