7 files changed, 95 insertions, 29 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5eb02069e1b8..851ba3dcdc29 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;
@@ -2261,7 +2248,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir,
         ei = PROC_I(inode);
         inode->i_mode = p->mode;
         if (S_ISDIR(inode->i_mode))
-                inode->i_nlink = 2;     /* Use getattr to fix if necessary */
+                set_nlink(inode, 2);    /* Use getattr to fix if necessary */
         if (p->iop)
                 inode->i_op = p->iop;
         if (p->fop)
@@ -2655,7 +2642,7 @@ static struct dentry *proc_base_instantiate(struct inode *dir,
 
         inode->i_mode = p->mode;
         if (S_ISDIR(inode->i_mode))
-                inode->i_nlink = 2;
+                set_nlink(inode, 2);
         if (S_ISLNK(inode->i_mode))
                 inode->i_size = 64;
         if (p->iop)
@@ -2994,8 +2981,8 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
         inode->i_fop = &proc_tgid_base_operations;
         inode->i_flags|=S_IMMUTABLE;
 
-        inode->i_nlink = 2 + pid_entry_count_dirs(tgid_base_stuff,
-                ARRAY_SIZE(tgid_base_stuff));
+        set_nlink(inode, 2 + pid_entry_count_dirs(tgid_base_stuff,
+                                                  ARRAY_SIZE(tgid_base_stuff)));
 
         d_set_d_op(dentry, &pid_dentry_operations);
 
@@ -3246,8 +3233,8 @@ static struct dentry *proc_task_instantiate(struct inode *dir,
         inode->i_fop = &proc_tid_base_operations;
         inode->i_flags|=S_IMMUTABLE;
 
-        inode->i_nlink = 2 + pid_entry_count_dirs(tid_base_stuff,
-                ARRAY_SIZE(tid_base_stuff));
+        set_nlink(inode, 2 + pid_entry_count_dirs(tid_base_stuff,
+                                                  ARRAY_SIZE(tid_base_stuff)));
 
         d_set_d_op(dentry, &pid_dentry_operations);
 
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 9d99131d0d65..10090d9c7ad5 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -283,7 +283,7 @@ static int proc_getattr(struct vfsmount *mnt, struct dentry *dentry,
         struct inode *inode = dentry->d_inode;
         struct proc_dir_entry *de = PROC_I(inode)->pde;
         if (de && de->nlink)
-                inode->i_nlink = de->nlink;
+                set_nlink(inode, de->nlink);
 
         generic_fillattr(inode, stat);
         return 0;
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 7ed72d6c1c6f..7737c5468a40 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -445,7 +445,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
                 if (de->size)
                         inode->i_size = de->size;
                 if (de->nlink)
-                        inode->i_nlink = de->nlink;
+                        set_nlink(inode, de->nlink);
                 if (de->proc_iops)
                         inode->i_op = de->proc_iops;
                 if (de->proc_fops) {
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 1a77dbef226f..a6b62173d4c3 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -3,6 +3,7 @@
  */
 #include <linux/init.h>
 #include <linux/sysctl.h>
+#include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/namei.h>
@@ -14,6 +15,15 @@ static const struct inode_operations proc_sys_inode_operations;
 static const struct file_operations proc_sys_dir_file_operations;
 static const struct inode_operations proc_sys_dir_operations;
 
+void proc_sys_poll_notify(struct ctl_table_poll *poll)
+{
+        if (!poll)
+                return;
+
+        atomic_inc(&poll->event);
+        wake_up_interruptible(&poll->wait);
+}
+
 static struct inode *proc_sys_make_inode(struct super_block *sb,
                 struct ctl_table_header *head, struct ctl_table *table)
 {
@@ -39,7 +49,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
                 inode->i_fop = &proc_sys_file_operations;
         } else {
                 inode->i_mode |= S_IFDIR;
-                inode->i_nlink = 0;
+                clear_nlink(inode);
                 inode->i_op = &proc_sys_dir_operations;
                 inode->i_fop = &proc_sys_dir_file_operations;
         }
@@ -176,6 +186,39 @@ static ssize_t proc_sys_write(struct file *filp, const char __user *buf,
         return proc_sys_call_handler(filp, (void __user *)buf, count, ppos, 1);
 }
 
+static int proc_sys_open(struct inode *inode, struct file *filp)
+{
+        struct ctl_table *table = PROC_I(inode)->sysctl_entry;
+
+        if (table->poll)
+                filp->private_data = proc_sys_poll_event(table->poll);
+
+        return 0;
+}
+
+static unsigned int proc_sys_poll(struct file *filp, poll_table *wait)
+{
+        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct ctl_table *table = PROC_I(inode)->sysctl_entry;
+        unsigned long event = (unsigned long)filp->private_data;
+        unsigned int ret = DEFAULT_POLLMASK;
+
+        if (!table->proc_handler)
+                goto out;
+
+        if (!table->poll)
+                goto out;
+
+        poll_wait(filp, &table->poll->wait, wait);
+
+        if (event != atomic_read(&table->poll->event)) {
+                filp->private_data = proc_sys_poll_event(table->poll);
+                ret = POLLIN | POLLRDNORM | POLLERR | POLLPRI;
+        }
+
+out:
+        return ret;
+}
 
 static int proc_sys_fill_cache(struct file *filp, void *dirent,
                                 filldir_t filldir,
@@ -364,12 +407,15 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
 }
 
 static const struct file_operations proc_sys_file_operations = {
+        .open           = proc_sys_open,
+        .poll           = proc_sys_poll,
         .read           = proc_sys_read,
         .write          = proc_sys_write,
         .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_sys_dir_file_operations = {
+        .read           = generic_read_dir,
         .readdir        = proc_sys_readdir,
         .llseek         = generic_file_llseek,
 };
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 9758b654a1bc..42b274da92c3 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -10,6 +10,7 @@
 #include <linux/time.h>
 #include <linux/irqnr.h>
 #include <asm/cputime.h>
+#include <linux/tick.h>
 
 #ifndef arch_irq_stat_cpu
 #define arch_irq_stat_cpu(cpu) 0
@@ -21,6 +22,35 @@
 #define arch_idle_time(cpu) 0
 #endif
 
+static cputime64_t get_idle_time(int cpu)
+{
+        u64 idle_time = get_cpu_idle_time_us(cpu, NULL);
+        cputime64_t idle;
+
+        if (idle_time == -1ULL) {
+                /* !NO_HZ so we can rely on cpustat.idle */
+                idle = kstat_cpu(cpu).cpustat.idle;
+                idle = cputime64_add(idle, arch_idle_time(cpu));
+        } else
+                idle = usecs_to_cputime(idle_time);
+
+        return idle;
+}
+
+static cputime64_t get_iowait_time(int cpu)
+{
+        u64 iowait_time = get_cpu_iowait_time_us(cpu, NULL);
+        cputime64_t iowait;
+
+        if (iowait_time == -1ULL)
+                /* !NO_HZ so we can rely on cpustat.iowait */
+                iowait = kstat_cpu(cpu).cpustat.iowait;
+        else
+                iowait = usecs_to_cputime(iowait_time);
+
+        return iowait;
+}
+
 static int show_stat(struct seq_file *p, void *v)
 {
         int i, j;
@@ -42,9 +72,8 @@ static int show_stat(struct seq_file *p, void *v)
                 user = cputime64_add(user, kstat_cpu(i).cpustat.user);
                 nice = cputime64_add(nice, kstat_cpu(i).cpustat.nice);
                 system = cputime64_add(system, kstat_cpu(i).cpustat.system);
-                idle = cputime64_add(idle, kstat_cpu(i).cpustat.idle);
-                idle = cputime64_add(idle, arch_idle_time(i));
-                iowait = cputime64_add(iowait, kstat_cpu(i).cpustat.iowait);
+                idle = cputime64_add(idle, get_idle_time(i));
+                iowait = cputime64_add(iowait, get_iowait_time(i));
                 irq = cputime64_add(irq, kstat_cpu(i).cpustat.irq);
                 softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
                 steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
@@ -76,14 +105,12 @@ static int show_stat(struct seq_file *p, void *v)
                 (unsigned long long)cputime64_to_clock_t(guest),
                 (unsigned long long)cputime64_to_clock_t(guest_nice));
         for_each_online_cpu(i) {
-
                 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
                 user = kstat_cpu(i).cpustat.user;
                 nice = kstat_cpu(i).cpustat.nice;
                 system = kstat_cpu(i).cpustat.system;
-                idle = kstat_cpu(i).cpustat.idle;
-                idle = cputime64_add(idle, arch_idle_time(i));
-                iowait = kstat_cpu(i).cpustat.iowait;
+                idle = get_idle_time(i);
+                iowait = get_iowait_time(i);
                 irq = kstat_cpu(i).cpustat.irq;
                 softirq = kstat_cpu(i).cpustat.softirq;
                 steal = kstat_cpu(i).cpustat.steal;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 5afaa58a8630..e418c5abdb0e 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -44,6 +44,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                 "VmPeak:\t%8lu kB\n"
                 "VmSize:\t%8lu kB\n"
                 "VmLck:\t%8lu kB\n"
+                "VmPin:\t%8lu kB\n"
                 "VmHWM:\t%8lu kB\n"
                 "VmRSS:\t%8lu kB\n"
                 "VmData:\t%8lu kB\n"
@@ -55,6 +56,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                 hiwater_vm << (PAGE_SHIFT-10),
                 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
                 mm->locked_vm << (PAGE_SHIFT-10),
+                mm->pinned_vm << (PAGE_SHIFT-10),
                 hiwater_rss << (PAGE_SHIFT-10),
                 total_rss << (PAGE_SHIFT-10),
                 data << (PAGE_SHIFT-10),
@@ -1039,6 +1041,9 @@ static int show_numa_map(struct seq_file *m, void *v)
                 seq_printf(m, " stack");
         }
 
+        if (is_vm_hugetlb_page(vma))
+                seq_printf(m, " huge");
+
         walk_page_range(vma->vm_start, vma->vm_end, &walk);
 
         if (!md->pages)
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index cd99bf557650..b0f450a2bb7c 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -12,6 +12,7 @@
 #include <linux/user.h>
 #include <linux/elf.h>
 #include <linux/elfcore.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/bootmem.h>