aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>2005-06-28 15:35:45 +0000
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>2005-06-28 15:35:45 +0000
commit92a9aed70cc7d2012304f127ca1227a1d8949786 (patch)
treeb7293570e2a0624ccbcc62b183815f9a60116f4a
parentda657a9c3ade636b95152f97ea312332621ed7ef (diff)
downloadxen-92a9aed70cc7d2012304f127ca1227a1d8949786.tar.gz
xen-92a9aed70cc7d2012304f127ca1227a1d8949786.tar.bz2
xen-92a9aed70cc7d2012304f127ca1227a1d8949786.zip
bitkeeper revision 1.1765 (42c16e51XwZ3-cKPHI29xhO2Hzk_sQ)
Increase size of xen_start_info_union since start_info structure size is > 512 bytes. Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
-rw-r--r--linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S2
-rw-r--r--linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
index 91036572bc..a0ccdbc2d9 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
@@ -34,7 +34,7 @@ ENTRY(startup_32)
/* Copy the necessary stuff from xen_start_info structure. */
mov $xen_start_info_union,%edi
- mov $128,%ecx
+ mov $512,%ecx
rep movsl
#ifdef CONFIG_SMP
diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
index 449dba9745..a2929951d2 100644
--- a/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
@@ -49,7 +49,7 @@
union xen_start_info_union
{
start_info_t xen_start_info;
- char padding[512];
+ char padding[2048];
};
extern union xen_start_info_union xen_start_info_union;
#define xen_start_info (xen_start_info_union.xen_start_info)