sched/core, ia64: Rename set_curr_task()

Rename the ia64 only set_curr_task() function to free up the name.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 7 insertions, 7 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index eb9220cde76c..d47616c8b885 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -986,7 +986,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs,
         int cpu = smp_processor_id();
 
         previous_current = curr_task(cpu);
-        set_curr_task(cpu, current);
+        ia64_set_curr_task(cpu, current);
         if ((p = strchr(current->comm, ' ')))
                 *p = '\0';
 
@@ -1360,14 +1360,14 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
                                 cpumask_clear_cpu(i, &mca_cpu); /* wake next cpu */
                                 while (monarch_cpu != -1)
                                         cpu_relax();    /* spin until last cpu leaves */
-                                set_curr_task(cpu, previous_current);
+                                ia64_set_curr_task(cpu, previous_current);
                                 ia64_mc_info.imi_rendez_checkin[cpu]
                                                 = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
                                 return;
                         }
                 }
         }
-        set_curr_task(cpu, previous_current);
+        ia64_set_curr_task(cpu, previous_current);
         ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
         monarch_cpu = -1;       /* This frees the slaves and previous monarchs */
 }
@@ -1729,7 +1729,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
                 NOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1);
 
                 mprintk("Slave on cpu %d returning to normal service.\n", cpu);
-                set_curr_task(cpu, previous_current);
+                ia64_set_curr_task(cpu, previous_current);
                 ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
                 atomic_dec(&slaves);
                 return;
@@ -1756,7 +1756,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
 
         mprintk("\nINIT dump complete.  Monarch on cpu %d returning to normal service.\n", cpu);
         atomic_dec(&monarchs);
-        set_curr_task(cpu, previous_current);
+        ia64_set_curr_task(cpu, previous_current);
         monarch_cpu = -1;
         return;
 }
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2c30ed860d66..ad51978ff15e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2581,7 +2581,7 @@ static inline bool is_idle_task(const struct task_struct *p)
         return p->pid == 0;
 }
 extern struct task_struct *curr_task(int cpu);
-extern void set_curr_task(int cpu, struct task_struct *p);
+extern void ia64_set_curr_task(int cpu, struct task_struct *p);
 
 void yield(void);
 
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2b5e150e070b..6ec0cfe56ddd 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7818,7 +7818,7 @@ struct task_struct *curr_task(int cpu)
  *
  * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
  */
-void set_curr_task(int cpu, struct task_struct *p)
+void ia64_set_curr_task(int cpu, struct task_struct *p)
 {
         cpu_curr(cpu) = p;
 }