Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- 2010-09-20.orig/xen/arch/ia64/xen/domain.c	2010-08-06 08:44:33.000000000 +0200
+++ 2010-09-20/xen/arch/ia64/xen/domain.c	2010-09-20 11:01:55.000000000 +0200
@@ -565,7 +565,7 @@ static void init_switch_stack(struct vcp
 {
 	struct pt_regs *regs = vcpu_regs (v);
 	struct switch_stack *sw = (struct switch_stack *) regs - 1;
-	extern void ia64_ret_from_clone;
+	extern char ia64_ret_from_clone;
 
 	memset(sw, 0, sizeof(struct switch_stack) + sizeof(struct pt_regs));
 	sw->ar_bspstore = (unsigned long)vcpu_to_rbs_bottom(v);
@@ -728,7 +728,7 @@ vcpu_to_switch_stack(struct vcpu* v)
 static int
 vcpu_has_not_run(struct vcpu* v)
 {
-	extern void ia64_ret_from_clone;
+	extern char ia64_ret_from_clone;
 	struct switch_stack *sw = vcpu_to_switch_stack(v);
 
 	return (sw == (struct switch_stack *)(vcpu_regs(v)) - 1) &&
--- 2010-09-20.orig/xen/arch/ia64/xen/machine_kexec.c	2010-09-20 11:00:48.000000000 +0200
+++ 2010-09-20/xen/arch/ia64/xen/machine_kexec.c	2010-09-20 10:59:09.000000000 +0200
@@ -104,7 +104,7 @@ void machine_reboot_kexec(xen_kexec_imag
 
 static int machine_kexec_get_xen(xen_kexec_range_t *range)
 {
-	range->start = range->start = ia64_tpa(_text);
+	range->start = ia64_tpa(_text);
 	range->size = (unsigned long)_end - (unsigned long)_text;
 	return 0;
 }