Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 42aa078a5e4d..d739703608fc 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -451,7 +451,7 @@ setup_smp(void)
         }
 
         printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_map = %lx\n",
-               smp_num_probed, cpu_present_map.bits[0]);
+               smp_num_probed, cpumask_bits(cpu_present_mask)[0]);
 }
 
 /*
@@ -585,8 +585,7 @@ handle_ipi(struct pt_regs *regs)
 
                 switch (which) {
                 case IPI_RESCHEDULE:
-                        /* Reschedule callback.  Everything to be done
-                           is done by the interrupt return path.  */
+                        scheduler_ipi();
                         break;
 
                 case IPI_CALL_FUNC:
@@ -630,8 +629,9 @@ smp_send_reschedule(int cpu)
 void
 smp_send_stop(void)
 {
-        cpumask_t to_whom = cpu_possible_map;
-        cpu_clear(smp_processor_id(), to_whom);
+        cpumask_t to_whom;
+        cpumask_copy(&to_whom, cpu_possible_mask);
+        cpumask_clear_cpu(smp_processor_id(), &to_whom);
 #ifdef DEBUG_IPI_MSG
         if (hard_smp_processor_id() != boot_cpu_id)
                 printk(KERN_WARNING "smp_send_stop: Not on boot cpu.\n");