drivers/staging/android/lowmemorykiller.c | 2 +- kernel/notifier.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 052b43e4e505..142bfc2f84db 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -79,7 +79,7 @@ task_notify_func(struct notifier_block *self, unsigned long val, void *data) if (task == lowmem_deathpending) lowmem_deathpending = NULL; - return NOTIFY_OK; + return NOTIFY_DONE; } static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) diff --git a/kernel/notifier.c b/kernel/notifier.c index 2d5cc4ccff7f..11fe956e8daf 100644 --- a/kernel/notifier.c +++ b/kernel/notifier.c @@ -90,7 +90,7 @@ static int __kprobes notifier_call_chain(struct notifier_block **nl, continue; } #endif - ret = nb->notifier_call(nb, val, v); + ret |= nb->notifier_call(nb, val, v); if (nr_calls) (*nr_calls)++;