ia64/xen-unstable

changeset 13817:9ee33c95305b

merge
author Ian Campbell <ian.campbell@xensource.com>
date Thu Feb 01 16:55:45 2007 +0000 (2007-02-01)
parents 138b7aa45ede 14fc88872c84
children cc36013f7785
files
line diff
     1.1 --- a/xen/common/kexec.c	Thu Feb 01 08:41:36 2007 -0800
     1.2 +++ b/xen/common/kexec.c	Thu Feb 01 16:55:45 2007 +0000
     1.3 @@ -141,7 +141,7 @@ static void setup_note(Elf_Note *n, cons
     1.4  static int sizeof_note(const char *name, int descsz)
     1.5  {
     1.6      return (sizeof(Elf_Note) +
     1.7 -            ELFNOTE_ALIGN(sizeof(name)) +
     1.8 +            ELFNOTE_ALIGN(strlen(name)+1) +
     1.9              ELFNOTE_ALIGN(descsz));
    1.10  }
    1.11  
    1.12 @@ -163,7 +163,7 @@ static int kexec_get(reserve)(xen_kexec_
    1.13  static int kexec_get(xen)(xen_kexec_range_t *range)
    1.14  {
    1.15      range->start = virt_to_maddr(_start);
    1.16 -    range->size = (unsigned long)_end - (unsigned long)_start;
    1.17 +    range->size = (unsigned long)xenheap_phys_end - (unsigned long)range->start;
    1.18      return 0;
    1.19  }
    1.20