Merge branch 'sched/urgent' into sched/core

Merge in fixes before we queue up dependent bits, to avoid conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 0 insertions, 78 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 144a96732dd7..5c1ad58c8028 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1165,81 +1165,6 @@ static const struct file_operations proc_pid_sched_operations = {
 
 #endif
 
-#ifdef CONFIG_SCHED_AUTOGROUP
-/*
- * Print out autogroup related information:
- */
-static int sched_autogroup_show(struct seq_file *m, void *v)
-{
-        struct inode *inode = m->private;
-        struct task_struct *p;
-
-        p = get_proc_task(inode);
-        if (!p)
-                return -ESRCH;
-        proc_sched_autogroup_show_task(p, m);
-
-        put_task_struct(p);
-
-        return 0;
-}
-
-static ssize_t
-sched_autogroup_write(struct file *file, const char __user *buf,
-            size_t count, loff_t *offset)
-{
-        struct inode *inode = file->f_path.dentry->d_inode;
-        struct task_struct *p;
-        char buffer[PROC_NUMBUF];
-        int nice;
-        int err;
-
-        memset(buffer, 0, sizeof(buffer));
-        if (count > sizeof(buffer) - 1)
-                count = sizeof(buffer) - 1;
-        if (copy_from_user(buffer, buf, count))
-                return -EFAULT;
-
-        err = kstrtoint(strstrip(buffer), 0, &nice);
-        if (err < 0)
-                return err;
-
-        p = get_proc_task(inode);
-        if (!p)
-                return -ESRCH;
-
-        err = proc_sched_autogroup_set_nice(p, nice);
-        if (err)
-                count = err;
-
-        put_task_struct(p);
-
-        return count;
-}
-
-static int sched_autogroup_open(struct inode *inode, struct file *filp)
-{
-        int ret;
-
-        ret = single_open(filp, sched_autogroup_show, NULL);
-        if (!ret) {
-                struct seq_file *m = filp->private_data;
-
-                m->private = inode;
-        }
-        return ret;
-}
-
-static const struct file_operations proc_pid_sched_autogroup_operations = {
-        .open           = sched_autogroup_open,
-        .read           = seq_read,
-        .write          = sched_autogroup_write,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-#endif /* CONFIG_SCHED_AUTOGROUP */
-
 static ssize_t comm_write(struct file *file, const char __user *buf,
                                 size_t count, loff_t *offset)
 {
@@ -2550,9 +2475,6 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_SCHED_DEBUG
         REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),
 #endif
-#ifdef CONFIG_SCHED_AUTOGROUP
-        REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
-#endif
         REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 #ifdef CONFIG_HAVE_ARCH_TRACEHOOK
         INF("syscall",    S_IRUGO, proc_pid_syscall),