--- v5
+++ v6
@@ -9,7 +9,7 @@
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
-index 28bc9f335d0d..ceccc5856aab 100644
+index be39903edae1..d419d0e51fe5 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -176,6 +176,7 @@ struct kexec_buf {
@@ -17,14 +17,14 @@
int (*func)(u64, u64, void *));
extern int kexec_add_buffer(struct kexec_buf *kbuf);
+int kexec_locate_mem_hole(struct kexec_buf *kbuf);
- int __weak arch_kexec_verify_buffer(enum kexec_file_type type, const void *buf,
- unsigned long size);
#endif /* CONFIG_KEXEC_FILE */
+
+ struct kimage {
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
-index 58818264ad0e..772cb491715e 100644
+index 82ccfc4ee97e..3125d1689712 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
-@@ -524,6 +524,23 @@ int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf,
+@@ -450,6 +450,23 @@ int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf,
}
/**
@@ -48,7 +48,7 @@
* kexec_add_buffer - place a buffer in a kexec segment
* @kbuf: Buffer contents and memory parameters.
*
-@@ -563,11 +580,9 @@ int kexec_add_buffer(struct kexec_buf *kbuf)
+@@ -489,11 +506,9 @@ int kexec_add_buffer(struct kexec_buf *kbuf)
kbuf->buf_align = max(kbuf->buf_align, PAGE_SIZE);
/* Walk the RAM ranges and allocate a suitable range for the buffer */