Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43cac0d authored by Dave Young's avatar Dave Young Committed by Linus Torvalds
Browse files

kexec: split kexec_file syscall code to kexec_file.c 



Split kexec_file syscall related code to another file kernel/kexec_file.c
so that the #ifdef CONFIG_KEXEC_FILE in kexec.c can be dropped.

Sharing variables and functions are moved to kernel/kexec_internal.h per
suggestion from Vivek and Petr.

[akpm@linux-foundation.org: fix bisectability]
[akpm@linux-foundation.org: declare the various arch_kexec functions]
[akpm@linux-foundation.org: fix build]
Signed-off-by: default avatarDave Young <dyoung@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Petr Tesarik <ptesarik@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Josh Boyer <jwboyer@fedoraproject.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a202fbbf

include/linux/kexec.h

+11 −0
Original line number Diff line number Diff line
@@ -318,6 +318,17 @@ int crash_shrink_memory(unsigned long new_size); 
size_t crash_get_memory_size(void);

void crash_free_reserved_phys_range(unsigned long begin, unsigned long end);



int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf,

					 unsigned long buf_len);

void * __weak arch_kexec_kernel_image_load(struct kimage *image);

int __weak arch_kimage_file_post_load_cleanup(struct kimage *image);

int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf,

					unsigned long buf_len);

int __weak arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr,

					Elf_Shdr *sechdrs, unsigned int relsec);

int __weak arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,

					unsigned int relsec);



#else /* !CONFIG_KEXEC */

struct pt_regs;

struct task_struct;

kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ obj-$(CONFIG_MODULE_SIG) += module_signing.o 
obj-$(CONFIG_KALLSYMS) += kallsyms.o

obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o

obj-$(CONFIG_KEXEC) += kexec.o

obj-$(CONFIG_KEXEC_FILE) += kexec_file.o

obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o

obj-$(CONFIG_COMPAT) += compat.o

obj-$(CONFIG_CGROUPS) += cgroup.o

kernel/kexec.c

+11 −1045

File changed.

Preview size limit exceeded, changes collapsed.

kernel/kexec_file.c

0 → 100644
+1045 −0

File added.

Preview size limit exceeded, changes collapsed.

kernel/kexec_internal.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#ifndef LINUX_KEXEC_INTERNAL_H

#define LINUX_KEXEC_INTERNAL_H



#include <linux/kexec.h>



struct kimage *do_kimage_alloc_init(void);

int sanity_check_segment_list(struct kimage *image);

void kimage_free_page_list(struct list_head *list);

void kimage_free(struct kimage *image);

int kimage_load_segment(struct kimage *image, struct kexec_segment *segment);

void kimage_terminate(struct kimage *image);

int kimage_is_destination_range(struct kimage *image,

				unsigned long start, unsigned long end);



extern struct mutex kexec_mutex;



#ifdef CONFIG_KEXEC_FILE

void kimage_file_post_load_cleanup(struct kimage *image);

#else /* CONFIG_KEXEC_FILE */

static inline void kimage_file_post_load_cleanup(struct kimage *image) { }

#endif /* CONFIG_KEXEC_FILE */

#endif /* LINUX_KEXEC_INTERNAL_H */