From: kaf24@firebug.cl.cam.ac.uk Date: Wed, 24 Aug 2005 13:17:12 +0000 (+0000) Subject: Copy correct number of bytes for xen_start_info in x86_64 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16844^2~24 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5097f2fbef038b46b19b053935a51dee7f17f04f;p=xen.git Copy correct number of bytes for xen_start_info in x86_64 head.S. Signed-off-by: Keir Fraser --- 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 50e3eccabd..e1f03535de 100644 --- 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 92a9c4a825..44a1823531 100644 --- 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;