summaryrefslogtreecommitdiffstats
path: root/kernel/kexec_file.c
diff options
context:
space:
mode:
authorXunlei Pang <xlpang@redhat.com>2016-01-20 18:00:36 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-20 20:09:18 -0500
commit978e30c9b46161c792ecdad0091fd017b21b8ca5 (patch)
tree2b9f2190bf48d175be825f5d48743b8defb3aab8 /kernel/kexec_file.c
parent2b24692b9235cb82b6f735b7a4c4137211ddf005 (diff)
kexec: move some memembers and definitions within the scope of CONFIG_KEXEC_FILE
Move the stuff currently only used by the kexec file code within CONFIG_KEXEC_FILE (and CONFIG_KEXEC_VERIFY_SIG). Also move internal "struct kexec_sha_region" and "struct kexec_buf" into "kexec_internal.h". Signed-off-by: Xunlei Pang <xlpang@redhat.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Dave Young <dyoung@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/kexec_file.c')
-rw-r--r--kernel/kexec_file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index b70ada0028d2..007b791f676d 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -109,11 +109,13 @@ int __weak arch_kimage_file_post_load_cleanup(struct kimage *image)
109 return -EINVAL; 109 return -EINVAL;
110} 110}
111 111
112#ifdef CONFIG_KEXEC_VERIFY_SIG
112int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, 113int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf,
113 unsigned long buf_len) 114 unsigned long buf_len)
114{ 115{
115 return -EKEYREJECTED; 116 return -EKEYREJECTED;
116} 117}
118#endif
117 119
118/* Apply relocations of type RELA */ 120/* Apply relocations of type RELA */
119int __weak 121int __weak