diff mbox

arch/powerpc/mm/numa.c: Fix break placement

Message ID 1407183190-1397-1-git-send-email-andrey.krieger.utkin@gmail.com (mailing list archive)
State Accepted
Delegated to: Benjamin Herrenschmidt
Headers show

Commit Message

Andrey Utkin Aug. 4, 2014, 8:13 p.m. UTC
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81631
Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
---
 arch/powerpc/mm/numa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Benjamin Herrenschmidt Aug. 5, 2014, 9:16 a.m. UTC | #1
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 <dcb314@hotmail.com>
> Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>

Thanks, I wonder how that managed to remain unnoticed for so long !

Cheers,
Ben.

> ---
>  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;
Michael Ellerman Aug. 5, 2014, 12:39 p.m. UTC | #2
On Tue, 2014-08-05 at 19:16 +1000, Benjamin Herrenschmidt wrote:
> 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 <dcb314@hotmail.com>
> > Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
> 
> 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
diff mbox

Patch

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;