diff options
author | Peter Zijlstra <peterz@infradead.org> | 2016-09-20 14:29:40 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-30 05:03:27 -0400 |
commit | a458ae2ea616420f74480f0f5ed67ca0f3b5dbf7 (patch) | |
tree | 871835cfd8e5ab67d47d46f865e1d0c49d3f0a66 /arch/ia64 | |
parent | a399d233078edbba7cf7902a6d080100cdf75636 (diff) |
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>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/mca.c | 10 |
1 files changed, 5 insertions, 5 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, | |||
986 | int cpu = smp_processor_id(); | 986 | int cpu = smp_processor_id(); |
987 | 987 | ||
988 | previous_current = curr_task(cpu); | 988 | previous_current = curr_task(cpu); |
989 | set_curr_task(cpu, current); | 989 | ia64_set_curr_task(cpu, current); |
990 | if ((p = strchr(current->comm, ' '))) | 990 | if ((p = strchr(current->comm, ' '))) |
991 | *p = '\0'; | 991 | *p = '\0'; |
992 | 992 | ||
@@ -1360,14 +1360,14 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, | |||
1360 | cpumask_clear_cpu(i, &mca_cpu); /* wake next cpu */ | 1360 | cpumask_clear_cpu(i, &mca_cpu); /* wake next cpu */ |
1361 | while (monarch_cpu != -1) | 1361 | while (monarch_cpu != -1) |
1362 | cpu_relax(); /* spin until last cpu leaves */ | 1362 | cpu_relax(); /* spin until last cpu leaves */ |
1363 | set_curr_task(cpu, previous_current); | 1363 | ia64_set_curr_task(cpu, previous_current); |
1364 | ia64_mc_info.imi_rendez_checkin[cpu] | 1364 | ia64_mc_info.imi_rendez_checkin[cpu] |
1365 | = IA64_MCA_RENDEZ_CHECKIN_NOTDONE; | 1365 | = IA64_MCA_RENDEZ_CHECKIN_NOTDONE; |
1366 | return; | 1366 | return; |
1367 | } | 1367 | } |
1368 | } | 1368 | } |
1369 | } | 1369 | } |
1370 | set_curr_task(cpu, previous_current); | 1370 | ia64_set_curr_task(cpu, previous_current); |
1371 | ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE; | 1371 | ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE; |
1372 | monarch_cpu = -1; /* This frees the slaves and previous monarchs */ | 1372 | monarch_cpu = -1; /* This frees the slaves and previous monarchs */ |
1373 | } | 1373 | } |
@@ -1729,7 +1729,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw, | |||
1729 | NOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1); | 1729 | NOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1); |
1730 | 1730 | ||
1731 | mprintk("Slave on cpu %d returning to normal service.\n", cpu); | 1731 | mprintk("Slave on cpu %d returning to normal service.\n", cpu); |
1732 | set_curr_task(cpu, previous_current); | 1732 | ia64_set_curr_task(cpu, previous_current); |
1733 | ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE; | 1733 | ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE; |
1734 | atomic_dec(&slaves); | 1734 | atomic_dec(&slaves); |
1735 | return; | 1735 | return; |
@@ -1756,7 +1756,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw, | |||
1756 | 1756 | ||
1757 | mprintk("\nINIT dump complete. Monarch on cpu %d returning to normal service.\n", cpu); | 1757 | mprintk("\nINIT dump complete. Monarch on cpu %d returning to normal service.\n", cpu); |
1758 | atomic_dec(&monarchs); | 1758 | atomic_dec(&monarchs); |
1759 | set_curr_task(cpu, previous_current); | 1759 | ia64_set_curr_task(cpu, previous_current); |
1760 | monarch_cpu = -1; | 1760 | monarch_cpu = -1; |
1761 | return; | 1761 | return; |
1762 | } | 1762 | } |