Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 6 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index acbc432d1a52..ddf74487f848 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -474,13 +474,8 @@ static bool __oom_reap_task(struct task_struct *tsk)
         p = find_lock_task_mm(tsk);
         if (!p)
                 goto unlock_oom;
-
         mm = p->mm;
-        if (!atomic_inc_not_zero(&mm->mm_users)) {
-                task_unlock(p);
-                goto unlock_oom;
-        }
-
+        atomic_inc(&mm->mm_users);
         task_unlock(p);
 
         if (!down_read_trylock(&mm->mmap_sem)) {