Added MBI module reloc fix (from unstable cs 19544).

 Changes to be committed:
	new file:   xen-3.4/module-reloc
	modified:   xen-3.4/series

diff --git a/xen-3.4/module-reloc b/xen-3.4/module-reloc
new file mode 100644 (file)
index 0000000..3363aaa
--- /dev/null
+++ b/xen-3.4/module-reloc
@@ -0,0 +1,52 @@
+diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
+index 8cf4190..6960ebb 100644
+--- a/xen/arch/x86/setup.c
++++ b/xen/arch/x86/setup.c
+@@ -419,7 +419,7 @@ void __init __start_xen(unsigned long mbi_p)
+     multiboot_info_t *mbi = __va(mbi_p);
+     module_t *mod = (module_t *)__va(mbi->mods_addr);
+     unsigned long nr_pages, modules_length, modules_headroom;
+-    int i, e820_warn = 0, bytes = 0;
++    int i, j, e820_warn = 0, bytes = 0;
+     struct ns16550_defaults ns16550 = {
+         .data_bits = 8,
+         .parity    = 'n',
+@@ -616,7 +616,9 @@ void __init __start_xen(unsigned long mbi_p)
+      * we can relocate the dom0 kernel and other multiboot modules. Also, on
+      * x86/64, we relocate Xen to higher memory.
+      */
+-    modules_length = mod[mbi->mods_count-1].mod_end - mod[0].mod_start;
++    modules_length = 0;
++    for ( i = 0; i < mbi->mods_count; i++ )
++        modules_length += mod[i].mod_end - mod[i].mod_start;
+ 
+     /* ensure mod[0] is mapped before parsing */
+     bootstrap_map(mod[0].mod_start, mod[0].mod_end);
+@@ -737,8 +739,15 @@ void __init __start_xen(unsigned long mbi_p)
+             initial_images_start = e;
+             e -= modules_headroom;
+             initial_images_base = e;
+-            move_memory(initial_images_start,
+-                        mod[0].mod_start, mod[mbi->mods_count-1].mod_end);
++            e += modules_length + modules_headroom;
++            for ( j = mbi->mods_count-1; j >= 0; j-- )
++            {
++                e -= mod[j].mod_end - mod[j].mod_start;
++                move_memory(e, mod[j].mod_start, mod[j].mod_end);
++                mod[j].mod_end += e - mod[j].mod_start;
++                mod[j].mod_start = e;
++            }
++
+         }
+ 
+         if ( !kexec_crash_area.start && (s < e) &&
+@@ -1032,8 +1041,7 @@ void __init __start_xen(unsigned long mbi_p)
+ 
+     if ( (initrdidx > 0) && (initrdidx < mbi->mods_count) )
+     {
+-        _initrd_start = initial_images_start +
+-            (mod[initrdidx].mod_start - mod[0].mod_start);
++        _initrd_start = mod[initrdidx].mod_start;
+         _initrd_len   = mod[initrdidx].mod_end - mod[initrdidx].mod_start;
+     }
+ 

diff --git a/xen-3.4/series b/xen-3.4/series
index eb482fdfe0cd63da42236ee9421b07591c99f5c1..7dca55d6cc41705a3007021feeed3821a899cd60 100644 (file)
--- a/xen-3.4/series
+++ b/xen-3.4/series
@@ -6,3 +6,4 @@ oem-features
 thermal-management
 pt-load-vga-bios
 init-vgabios-and-set-size
+module-reloc