Merge branch 'linus' into x86/x2apic

2008-07-18 22:50:34 +02:00
parent 511d9d3418 5b664cb235
commit a208f37a46
3697 changed files with 244003 additions and 275846 deletions
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1243,7 +1243,9 @@ static const struct smp_ops xen_smp_ops __initdata = {

 	.smp_send_stop = xen_smp_send_stop,
 	.smp_send_reschedule = xen_smp_send_reschedule,
-	.smp_call_function_mask = xen_smp_call_function_mask,
+
+	.send_call_func_ipi = xen_smp_send_call_function_ipi,
+	.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi,
 };
 #endif	/* CONFIG_SMP */