Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Matt Redfearn <matt.redfearn@mips.com>
To: Ralf Baechle <ralf@linux-mips.org>, <jhogan@kernel.org>
Cc: <linux-mips@linux-mips.org>,
	Matt Redfearn <matt.redfearn@mips.com>,
	Dengcheng Zhu <dengcheng.zhu@mips.com>,
	<linux-kernel@vger.kernel.org>,
	"Paul Burton" <paul.burton@mips.com>,
	Ingo Molnar <mingo@kernel.org>
Subject: [PATCH 1/2] MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
Date: Fri, 15 Dec 2017 09:34:53 +0000	[thread overview]
Message-ID: <1513330494-21249-1-git-send-email-matt.redfearn@mips.com> (raw)

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.

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
---

 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]);
-
 		/* Look for another online VPE within the core */
 		for_each_online_cpu(cpu_death_sibling) {
 			if (!cpus_are_siblings(cpu, cpu_death_sibling))
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Matt Redfearn <matt.redfearn@mips.com>
To: Ralf Baechle <ralf@linux-mips.org>, jhogan@kernel.org
Cc: linux-mips@linux-mips.org, Matt Redfearn <matt.redfearn@mips.com>,
	Dengcheng Zhu <dengcheng.zhu@mips.com>,
	linux-kernel@vger.kernel.org, Paul Burton <paul.burton@mips.com>,
	Ingo Molnar <mingo@kernel.org>
Subject: [PATCH 1/2] MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
Date: Fri, 15 Dec 2017 09:34:53 +0000	[thread overview]
Message-ID: <1513330494-21249-1-git-send-email-matt.redfearn@mips.com> (raw)
Message-ID: <20171215093453.sZwWqgZd8ProglwAj9q-sbAcGDOOQee0P6ik5cK3Ojs@z> (raw)

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.

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
---

 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]);
-
 		/* Look for another online VPE within the core */
 		for_each_online_cpu(cpu_death_sibling) {
 			if (!cpus_are_siblings(cpu, cpu_death_sibling))
-- 
2.7.4

             reply	other threads:[~2017-12-15  9:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-15  9:34 Matt Redfearn [this message]
2017-12-15  9:34 ` [PATCH 1/2] MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead Matt Redfearn
2017-12-15  9:34 ` [PATCH 2/2] MIPS: pm-cps: Warn if JTAG presence will block power gating Matt Redfearn
2017-12-15  9:34   ` Matt Redfearn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1513330494-21249-1-git-send-email-matt.redfearn@mips.com \
    --to=matt.redfearn@mips.com \
    --cc=dengcheng.zhu@mips.com \
    --cc=jhogan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=mingo@kernel.org \
    --cc=paul.burton@mips.com \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox