ia64/xen-unstable

changeset 19112:a8c342f352c3

x86: Although bzimage_headroom() doesn't return -ve values,
bzimage_parse() can.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jan 29 11:28:09 2009 +0000 (2009-01-29)
parents 1bd06ed9369d
children 1dc576b683c6
files xen/arch/x86/bzimage.c
line diff
     1.1 --- a/xen/arch/x86/bzimage.c	Thu Jan 29 01:16:30 2009 +0000
     1.2 +++ b/xen/arch/x86/bzimage.c	Thu Jan 29 11:28:09 2009 +0000
     1.3 @@ -185,7 +185,7 @@ static __init int bzimage_check(struct s
     1.4      if ( hdr->version < VERSION(2,8) ) {
     1.5          printk("Cannot load bzImage v%d.%02d at least v2.08 is required\n",
     1.6             hdr->version >> 8, hdr->version & 0xff);
     1.7 -        return 0;
     1.8 +        return -EINVAL;
     1.9      }
    1.10      return 1;
    1.11  }
    1.12 @@ -198,7 +198,7 @@ int __init bzimage_headroom(char *image_
    1.13  
    1.14      err = bzimage_check(hdr, image_length);
    1.15      if (err < 1)
    1.16 -        return err;
    1.17 +        return 0;
    1.18  
    1.19      img = image_start + (hdr->setup_sects+1) * 512;
    1.20      img += hdr->payload_offset;