In kdump case, there exists only one dedicated memblock region as usable
memory (crashk_res). With this patch, kexec_walk_memblock() runs a given
callback function on this region.

Cosmetic change: 0 to MEMBLOCK_NONE at for_each_free_mem_range*()

Signed-off-by: AKASHI Takahiro <takahiro.aka...@linaro.org>
Cc: Dave Young <dyo...@redhat.com>
Cc: Vivek Goyal <vgo...@redhat.com>
Cc: Baoquan He <b...@redhat.com>
---
 kernel/kexec_file.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 370d7eab49fe..2f615a7968dd 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -511,8 +511,11 @@ static int kexec_walk_memblock(struct kexec_buf *kbuf,
        phys_addr_t mstart, mend;
        struct resource res = { };
 
+       if (kbuf->image->type == KEXEC_TYPE_CRASH)
+               return func(&crashk_res, kbuf);
+
        if (kbuf->top_down) {
-               for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0,
+               for_each_free_mem_range_reverse(i, NUMA_NO_NODE, MEMBLOCK_NONE,
                                                &mstart, &mend, NULL) {
                        /*
                         * In memblock, end points to the first byte after the
@@ -526,8 +529,8 @@ static int kexec_walk_memblock(struct kexec_buf *kbuf,
                                break;
                }
        } else {
-               for_each_free_mem_range(i, NUMA_NO_NODE, 0, &mstart, &mend,
-                                       NULL) {
+               for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
+                                       &mstart, &mend, NULL) {
                        /*
                         * In memblock, end points to the first byte after the
                         * range while in kexec, end points to the last byte
-- 
2.18.0


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Reply via email to