From: Julien Grall Date: Mon, 17 Mar 2014 14:05:54 +0000 (+0000) Subject: xen/arm: next_module: Skip module if the size is 0 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5374 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c84e6224f5c9788cf8356cc2aad32b4a12d9834e;p=xen.git xen/arm: next_module: Skip module if the size is 0 When the the module size is 0, it means that the module was not provided by the user. It can happen, if the user choose to boot without initrd. In this case, both fields (start and size) are zeroed. Therefore, next_module will return 0 every time if there is other non-zero module after this one. This can happen when the XSM module is added. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d59e7f860b..215ec242cf 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -284,6 +284,9 @@ static paddr_t __init next_module(paddr_t s, paddr_t *end) paddr_t mod_s = mi->module[i].start; paddr_t mod_e = mod_s + mi->module[i].size; + if ( !mi->module[i].size ) + continue; + if ( mod_s < s ) continue; if ( mod_s > lowest )