| Message ID | 1457472378-22274-1-git-send-email-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2016-08-03 at 21:26:17 UTC, Rasmus Villemoes wrote: > cmm_mem_going_offline is (only) called from cmm_memory_cb(), which > sends the return value through notifier_from_errno(). The latter > expects 0 or -errno (notifier_to_errno(notifier_from_errno(x)) is 0 > for any x >= 0, so passing a positive value cannot make sense). Hence > negate ENOMEM. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/e2be23712a9c8e3710c9e2684a cheers
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index fc44ad0475f8..66e7227469b8 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c @@ -574,7 +574,7 @@ static int cmm_mem_going_offline(void *arg) cmm_dbg("Failed to allocate memory for list " "management. Memory hotplug " "failed.\n"); - return ENOMEM; + return -ENOMEM; } memcpy(npa, pa_curr, PAGE_SIZE); if (pa_curr == cmm_page_list)
cmm_mem_going_offline is (only) called from cmm_memory_cb(), which sends the return value through notifier_from_errno(). The latter expects 0 or -errno (notifier_to_errno(notifier_from_errno(x)) is 0 for any x >= 0, so passing a positive value cannot make sense). Hence negate ENOMEM. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/powerpc/platforms/pseries/cmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)