Merge tag 'arm-soc-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[platform/kernel/linux-rpi.git] / kernel / kexec_file.c

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index faa74d5..bb05fd5 100644 (file)
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -540,6 +540,11 @@ static int locate_mem_hole_callback(struct resource *res, void *arg)
        unsigned long sz = end - start + 1;
 
        /* Returning 0 will take to next memory range */
+
+       /* Don't use memory that will be detected and handled by a driver. */
+       if (res->flags & IORESOURCE_MEM_DRIVER_MANAGED)
+               return 0;
+
        if (sz < kbuf->memsz)
                return 0;