[PATCH] arch/powerpc/mm/numa.c: Fix break placement

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE4429d

3 messages, 3 authors, 2014-08-05 · open the first message on its own page

[PATCH] arch/powerpc/mm/numa.c: Fix break placement

From: Andrey Utkin <hidden>
Date: 2014-08-04 20:13:34

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81631
Reported-by: David Binderman <redacted>
Signed-off-by: Andrey Utkin <redacted>
---
 arch/powerpc/mm/numa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 3b181b2..d3e9a78 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -611,8 +611,8 @@ static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
 	case CPU_UP_CANCELED:
 	case CPU_UP_CANCELED_FROZEN:
 		unmap_cpu_from_node(lcpu);
-		break;
 		ret = NOTIFY_OK;
+		break;
 #endif
 	}
 	return ret;
-- 
1.8.5.5

Re: [PATCH] arch/powerpc/mm/numa.c: Fix break placement

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2014-08-05 09:18:51

On Mon, 2014-08-04 at 23:13 +0300, Andrey Utkin wrote:
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81631
Reported-by: David Binderman <redacted>
Signed-off-by: Andrey Utkin <redacted>
Thanks, I wonder how that managed to remain unnoticed for so long !

Cheers,
Ben.
quoted hunk
---
 arch/powerpc/mm/numa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 3b181b2..d3e9a78 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -611,8 +611,8 @@ static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
 	case CPU_UP_CANCELED:
 	case CPU_UP_CANCELED_FROZEN:
 		unmap_cpu_from_node(lcpu);
-		break;
 		ret = NOTIFY_OK;
+		break;
 #endif
 	}
 	return ret;

Re: [PATCH] arch/powerpc/mm/numa.c: Fix break placement

From: Michael Ellerman <mpe@ellerman.id.au>
Date: 2014-08-05 12:39:58

On Tue, 2014-08-05 at 19:16 +1000, Benjamin Herrenschmidt wrote:
On Mon, 2014-08-04 at 23:13 +0300, Andrey Utkin wrote:
quoted
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81631
Reported-by: David Binderman <redacted>
Signed-off-by: Andrey Utkin <redacted>
Thanks, I wonder how that managed to remain unnoticed for so long !
1. No one tested it :)
2. The code stupidly initialises ret at the beginning of the function, so the
   compiler can't help us detect the unitialised usage.
3. NOTIFY_OK and NOTIFY_DONE appear to be equivalent in practice.

cheers
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help