2 files changed, 0 insertions, 17 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 25dcbe5fc356..36254645b7cc 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -841,10 +841,6 @@ static int exec_mmap(struct mm_struct *mm)
         tsk->mm = mm;
         tsk->active_mm = mm;
         activate_mm(active_mm, mm);
-        if (old_mm && tsk->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) {
-                atomic_dec(&old_mm->oom_disable_count);
-                atomic_inc(&tsk->mm->oom_disable_count);
-        }
         task_unlock(tsk);
         arch_pick_mmap_layout(mm);
         if (old_mm) {
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5eb02069e1b8..8f0087e20e16 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1107,13 +1107,6 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
                 goto err_sighand;
         }
 
-        if (oom_adjust != task->signal->oom_adj) {
-                if (oom_adjust == OOM_DISABLE)
-                        atomic_inc(&task->mm->oom_disable_count);
-                if (task->signal->oom_adj == OOM_DISABLE)
-                        atomic_dec(&task->mm->oom_disable_count);
-        }
-
         /*
          * Warn that /proc/pid/oom_adj is deprecated, see
          * Documentation/feature-removal-schedule.txt.
@@ -1215,12 +1208,6 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
                 goto err_sighand;
         }
 
-        if (oom_score_adj != task->signal->oom_score_adj) {
-                if (oom_score_adj == OOM_SCORE_ADJ_MIN)
-                        atomic_inc(&task->mm->oom_disable_count);
-                if (task->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
-                        atomic_dec(&task->mm->oom_disable_count);
-        }
         task->signal->oom_score_adj = oom_score_adj;
         if (has_capability_noaudit(current, CAP_SYS_RESOURCE))
                 task->signal->oom_score_adj_min = oom_score_adj;