--- v4
+++ v10
@@ -2,18 +2,17 @@
implementation to find free memory for the purgatory stack.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
-Cc: Eric Biederman <ebiederm@xmission.com>
-Cc: Dave Young <dyoung@redhat.com>
+Acked-by: Dave Young <dyoung@redhat.com>
---
include/linux/kexec.h | 1 +
kernel/kexec_file.c | 25 ++++++++++++++++++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
-index ff5fa7707bd7..803f563df81d 100644
+index 437ef1b47428..a33f63351f86 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
-@@ -174,6 +174,7 @@ struct kexec_buf {
+@@ -176,6 +176,7 @@ struct kexec_buf {
int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf,
int (*func)(u64, u64, void *));
extern int kexec_add_buffer(struct kexec_buf *kbuf);
@@ -22,7 +21,7 @@
struct kimage {
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
-index 82ccfc4ee97e..3125d1689712 100644
+index efd2c094af7e..0c2df7f73792 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -450,6 +450,23 @@ int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf,
@@ -65,4 +64,4 @@
/* Found a suitable memory range */
ksegment = &kbuf->image->segment[kbuf->image->nr_segments];
--
-1.9.1
+2.7.4