X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kernel%2Fkexec_file.c;h=bb05fd52de850ad388cdcd228d62e145804d611e;hb=694b5a5d313f3997764b67d52bab66ec7e59e714;hp=faa74d5f69411b420c7ea47cc58f1476ca0eafe7;hpb=f43574d0ac80d76537e265548a13b1bc46aa751b;p=platform%2Fkernel%2Flinux-rpi.git diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index faa74d5..bb05fd5 100644 --- 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;