Copy correct number of bytes for xen_start_info in x86_64

head.S.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
index 50e3eccabdb10543054a0ab46b408a64492c8cba..e1f03535de3d26d09581d1a64aac368c6a998da1 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
@@ -43,7 +43,7 @@ ENTRY(_start)
         cld                
        /* Copy the necessary stuff from xen_start_info structure. */
        movq  $xen_start_info_union,%rdi
-       movq  $64,%rcx          /* sizeof (union xen_start_info_union) / sizeof (long) */
+       movq  $256,%rcx
        rep movsq
 
 #ifdef CONFIG_SMP

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index 92a9c4a8250d0152f92d0acf753271a6fccb0fbf..44a1823531b3f1c1b9097c4b1eedca8ab2aed5f5 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -639,7 +639,7 @@ static int __init xenbus_probe_init(void)
        bus_register(&xenbus_backend.bus);
        device_register(&xenbus_frontend.dev);
        device_register(&xenbus_backend.dev);
-       
+
        if (!xen_start_info.store_evtchn)
                return 0;