MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
"Linux Kernel Mailing List" <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.head |
|---|---|
| Message-ID | <[email protected]> |
Web: https://git.kernel.org/torvalds/c/91d9f8fcf7cc222f4bc7b5fc6496d137eadf8226 Commit: 91d9f8fcf7cc222f4bc7b5fc6496d137eadf8226 Parent: 7bf8b16d1b60419c865e423b907a05f413745b3e Refname: refs/heads/master Author: Matt Redfearn <[email protected]> AuthorDate: Fri Dec 15 09:34:53 2017 +0000 Committer: James Hogan <[email protected]> CommitDate: Mon Feb 5 14:36:06 2018 +0000 MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead The merge of commit f875a832d2028 ("MIPS: Abstract CPU core & VP(E) ID access through accessor functions") ended up creating a duplicate assignment of core during the rebase on commit bac06cf0fb9d ("MIPS: smp-cps: Fix potentially uninitialised value of core"). Remove the duplicate. Fixes: f875a832d202 ("MIPS: Abstract CPU core & VP(E) ID access through accessor functions") Signed-off-by: Matt Redfearn <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Paul Burton <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/17955/ Signed-off-by: James Hogan <[email protected]> --- arch/mips/kernel/smp-cps.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c index ecc1a853f48d..03f1026ad148 100644 --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c @@ -439,8 +439,6 @@ void play_dead(void) pr_debug("CPU%d going offline\n", cpu); if (cpu_has_mipsmt || cpu_has_vp) { - core = cpu_core(&cpu_data[cpu]);