[3.13.y.z extended stable] Patch "powerpc/mm/numa: Fix break placement" has been added to staging queue
Kamal Mostafa
kamal at canonical.com
Mon Sep 15 22:07:58 UTC 2014
This is a note to let you know that I have just added a patch titled
powerpc/mm/numa: Fix break placement
to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue
This patch is scheduled to be released in version 3.13.11.7.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.13.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
------
>From f4c215ad40d40fe5e52deb38887de0536aa2c36e Mon Sep 17 00:00:00 2001
From: Andrey Utkin <andrey.krieger.utkin at gmail.com>
Date: Mon, 4 Aug 2014 23:13:10 +0300
Subject: powerpc/mm/numa: Fix break placement
commit b00fc6ec1f24f9d7af9b8988b6a198186eb3408c upstream.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81631
Reported-by: David Binderman <dcb314 at hotmail.com>
Signed-off-by: Andrey Utkin <andrey.krieger.utkin at gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
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 6847d50..c752d50 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -588,8 +588,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.9.1
More information about the kernel-team
mailing list