WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-3.4-testing] x86: Correctly allocate module-relocat

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-3.4-testing] x86: Correctly allocate module-relocation area and bzimage headroom.
From: "Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 01 Dec 2009 06:31:15 -0800
Delivery-date: Tue, 01 Dec 2009 06:34:00 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259677520 0
# Node ID 97ab480f7e80a7de75d21ba1764942be473cd0dd
# Parent  751fef67bbe44beebd0b6db4183c852fdd1b68cc
x86: Correctly allocate module-relocation area and bzimage headroom.

Without this patch, loading a bzimage dom0 kernel while also
requesting a dynamically-allocated crashkernel area is broken.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20550:aae0afcc05e3
xen-unstable date:        Tue Dec 01 14:19:28 2009 +0000
---
 xen/arch/x86/setup.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff -r 751fef67bbe4 -r 97ab480f7e80 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Fri Nov 27 08:34:49 2009 +0000
+++ b/xen/arch/x86/setup.c      Tue Dec 01 14:25:20 2009 +0000
@@ -733,11 +733,9 @@ void __init __start_xen(unsigned long mb
              ((e-s) >= (modules_length+modules_headroom)) )
         {
             initial_images_end = e;
-            e = (e - modules_length) & PAGE_MASK;
-            initial_images_start = e;
-            e -= modules_headroom;
-            initial_images_base = e;
-            e += modules_length + modules_headroom;
+            initial_images_start = initial_images_end - modules_length;
+            initial_images_base = initial_images_start - modules_headroom;
+            initial_images_base &= PAGE_MASK;
             for ( j = mbi->mods_count-1; j >= 0; j-- )
             {
                 e -= mod[j].mod_end - mod[j].mod_start;
@@ -745,6 +743,7 @@ void __init __start_xen(unsigned long mb
                 mod[j].mod_end += e - mod[j].mod_start;
                 mod[j].mod_start = e;
             }
+            e = initial_images_base;
         }
 
         if ( !kexec_crash_area.start && (s < e) &&

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-3.4-testing] x86: Correctly allocate module-relocation area and bzimage headroom., Xen patchbot-3.4-testing <=