From c51f7e3096e317239ee4225ffcaf8c68fa6f682a Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Thu, 5 Mar 2009 20:13:57 +0100
Subject: [PATCH] --- yaml --- r: 145823 b: refs/heads/master c:
 e9e2d1ffcfdb38bed11a3064aa74bea9ee38ed80 h: refs/heads/master i:   145821:
 d6b79fcb45db81837c24e9a3e53c8384b8cac5ab   145819:
 b6afe339f7decec306f27ca13cc79cd47459be2b   145815:
 1ebc8b6ddf3447f052bfe13de4a01efdba74dccd   145807:
 9d55383e39913f9beda5a3b7e757baa8cd5fd259   145791:
 6675e3a4348aebcd111f4b125b4e944cdff5de19 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/xen/smp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 85d96027c433..9c2630cf37fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4b7e58590d0e94ed78bd6be1aa163caba7b6c74
+refs/heads/master: e9e2d1ffcfdb38bed11a3064aa74bea9ee38ed80
diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c
index 8d470562ffc9..304d832710cd 100644
--- a/trunk/arch/x86/xen/smp.c
+++ b/trunk/arch/x86/xen/smp.c
@@ -317,7 +317,7 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
 	BUG_ON(rc);
 
 	while(per_cpu(cpu_state, cpu) != CPU_ONLINE) {
-		HYPERVISOR_sched_op(SCHEDOP_yield, 0);
+		HYPERVISOR_sched_op(SCHEDOP_yield, NULL);
 		barrier();
 	}
 
@@ -422,7 +422,7 @@ static void xen_smp_send_call_function_ipi(const struct cpumask *mask)
 	/* Make sure other vcpus get a chance to run if they need to. */
 	for_each_cpu(cpu, mask) {
 		if (xen_vcpu_stolen(cpu)) {
-			HYPERVISOR_sched_op(SCHEDOP_yield, 0);
+			HYPERVISOR_sched_op(SCHEDOP_yield, NULL);
 			break;
 		}
 	}