[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1170348945 0
# Node ID 9ee33c95305b9005c20108122571cb416dc9ef74
# Parent  138b7aa45edef394e5b3be1e35ae8d63e1f04746
# Parent  14fc88872c8476e7ee5c61ccf691765db781e79a
merge
---
 xen/common/kexec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 138b7aa45ede -r 9ee33c95305b xen/common/kexec.c
--- a/xen/common/kexec.c        Thu Feb 01 08:41:36 2007 -0800
+++ b/xen/common/kexec.c        Thu Feb 01 16:55:45 2007 +0000
@@ -141,7 +141,7 @@ static int sizeof_note(const char *name,
 static int sizeof_note(const char *name, int descsz)
 {
     return (sizeof(Elf_Note) +
-            ELFNOTE_ALIGN(sizeof(name)) +
+            ELFNOTE_ALIGN(strlen(name)+1) +
             ELFNOTE_ALIGN(descsz));
 }
 
@@ -163,7 +163,7 @@ static int kexec_get(xen)(xen_kexec_rang
 static int kexec_get(xen)(xen_kexec_range_t *range)
 {
     range->start = virt_to_maddr(_start);
-    range->size = (unsigned long)_end - (unsigned long)_start;
+    range->size = (unsigned long)xenheap_phys_end - (unsigned 
long)range->start;
     return 0;
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog