4 files changed, 11 insertions, 121 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index d295af993677..ef5c84be66f9 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -873,111 +873,6 @@ static const struct file_operations proc_environ_operations = {
         .release        = mem_release,
 };
 
-static ssize_t oom_adjust_read(struct file *file, char __user *buf,
-                                size_t count, loff_t *ppos)
-{
-        struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-        char buffer[PROC_NUMBUF];
-        size_t len;
-        int oom_adjust = OOM_DISABLE;
-        unsigned long flags;
-
-        if (!task)
-                return -ESRCH;
-
-        if (lock_task_sighand(task, &flags)) {
-                oom_adjust = task->signal->oom_adj;
-                unlock_task_sighand(task, &flags);
-        }
-
-        put_task_struct(task);
-
-        len = snprintf(buffer, sizeof(buffer), "%i\n", oom_adjust);
-
-        return simple_read_from_buffer(buf, count, ppos, buffer, len);
-}
-
-static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
-                                size_t count, loff_t *ppos)
-{
-        struct task_struct *task;
-        char buffer[PROC_NUMBUF];
-        int oom_adjust;
-        unsigned long flags;
-        int err;
-
-        memset(buffer, 0, sizeof(buffer));
-        if (count > sizeof(buffer) - 1)
-                count = sizeof(buffer) - 1;
-        if (copy_from_user(buffer, buf, count)) {
-                err = -EFAULT;
-                goto out;
-        }
-
-        err = kstrtoint(strstrip(buffer), 0, &oom_adjust);
-        if (err)
-                goto out;
-        if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) &&
-             oom_adjust != OOM_DISABLE) {
-                err = -EINVAL;
-                goto out;
-        }
-
-        task = get_proc_task(file->f_path.dentry->d_inode);
-        if (!task) {
-                err = -ESRCH;
-                goto out;
-        }
-
-        task_lock(task);
-        if (!task->mm) {
-                err = -EINVAL;
-                goto err_task_lock;
-        }
-
-        if (!lock_task_sighand(task, &flags)) {
-                err = -ESRCH;
-                goto err_task_lock;
-        }
-
-        if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) {
-                err = -EACCES;
-                goto err_sighand;
-        }
-
-        /*
-         * Warn that /proc/pid/oom_adj is deprecated, see
-         * Documentation/feature-removal-schedule.txt.
-         */
-        printk_once(KERN_WARNING "%s (%d): /proc/%d/oom_adj is deprecated, please use /proc/%d/oom_score_adj instead.\n",
-                  current->comm, task_pid_nr(current), task_pid_nr(task),
-                  task_pid_nr(task));
-        task->signal->oom_adj = oom_adjust;
-        /*
-         * Scale /proc/pid/oom_score_adj appropriately ensuring that a maximum
-         * value is always attainable.
-         */
-        if (task->signal->oom_adj == OOM_ADJUST_MAX)
-                task->signal->oom_score_adj = OOM_SCORE_ADJ_MAX;
-        else
-                task->signal->oom_score_adj = (oom_adjust * OOM_SCORE_ADJ_MAX) /
-                                                                -OOM_DISABLE;
-        trace_oom_score_adj_update(task);
-err_sighand:
-        unlock_task_sighand(task, &flags);
-err_task_lock:
-        task_unlock(task);
-        put_task_struct(task);
-out:
-        return err < 0 ? err : count;
-}
-
-static const struct file_operations proc_oom_adjust_operations = {
-        .read           = oom_adjust_read,
-        .write          = oom_adjust_write,
-        .llseek         = generic_file_llseek,
-};
-
 static ssize_t oom_score_adj_read(struct file *file, char __user *buf,
                                         size_t count, loff_t *ppos)
 {
@@ -1051,15 +946,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
         if (has_capability_noaudit(current, CAP_SYS_RESOURCE))
                 task->signal->oom_score_adj_min = oom_score_adj;
         trace_oom_score_adj_update(task);
-        /*
-         * Scale /proc/pid/oom_adj appropriately ensuring that OOM_DISABLE is
-         * always attainable.
-         */
-        if (task->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
-                task->signal->oom_adj = OOM_DISABLE;
-        else
-                task->signal->oom_adj = (oom_score_adj * OOM_ADJUST_MAX) /
-                                                        OOM_SCORE_ADJ_MAX;
+
 err_sighand:
         unlock_task_sighand(task, &flags);
 err_task_lock:
@@ -2710,7 +2597,6 @@ static const struct pid_entry tgid_base_stuff[] = {
         REG("cgroup",  S_IRUGO, proc_cgroup_operations),
 #endif
         INF("oom_score",  S_IRUGO, proc_oom_score),
-        REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
         REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
 #ifdef CONFIG_AUDITSYSCALL
         REG("loginuid",   S_IWUSR|S_IRUGO, proc_loginuid_operations),
@@ -3077,7 +2963,6 @@ static const struct pid_entry tid_base_stuff[] = {
         REG("cgroup",  S_IRUGO, proc_cgroup_operations),
 #endif
         INF("oom_score", S_IRUGO, proc_oom_score),
-        REG("oom_adj",   S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
         REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
 #ifdef CONFIG_AUDITSYSCALL
         REG("loginuid",  S_IWUSR|S_IRUGO, proc_loginuid_operations),
diff --git a/fs/proc/page.c b/fs/proc/page.c
index 7fcd0d60a968..b8730d9ebaee 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -115,7 +115,13 @@ u64 stable_page_flags(struct page *page)
                 u |= 1 << KPF_COMPOUND_TAIL;
         if (PageHuge(page))
                 u |= 1 << KPF_HUGE;
-        else if (PageTransCompound(page))
+        /*
+         * PageTransCompound can be true for non-huge compound pages (slab
+         * pages or pages allocated by drivers with __GFP_COMP) because it
+         * just checks PG_head/PG_tail, so we need to check PageLRU to make
+         * sure a given page is a thp, not a non-huge compound page.
+         */
+        else if (PageTransCompound(page) && PageLRU(compound_trans_head(page)))
                 u |= 1 << KPF_THP;
 
         /*
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index dcd56f84db7e..a781bdf06694 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -142,6 +142,7 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)
         }
 
         rb_link_node(node, parent, p);
+        rb_insert_color(node, &head->parent->root);
         return 0;
 }
 
@@ -168,10 +169,8 @@ static void init_header(struct ctl_table_header *head,
         head->node = node;
         if (node) {
                 struct ctl_table *entry;
-                for (entry = table; entry->procname; entry++, node++) {
-                        rb_init_node(&node->node);
+                for (entry = table; entry->procname; entry++, node++)
                         node->header = head;
-                }
         }
 }
 
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 4540b8f76f16..79827ce03e3b 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -54,7 +54,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                 "VmPTE:\t%8lu kB\n"
                 "VmSwap:\t%8lu kB\n",
                 hiwater_vm << (PAGE_SHIFT-10),
-                (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
+                total_vm << (PAGE_SHIFT-10),
                 mm->locked_vm << (PAGE_SHIFT-10),
                 mm->pinned_vm << (PAGE_SHIFT-10),
                 hiwater_rss << (PAGE_SHIFT-10),