5 files changed, 23 insertions, 15 deletions

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 79375fc115d2..d67a72dcb92c 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -430,8 +430,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                  * safe because the task has stopped executing permanently.
                  */
                 if (permitted && (task->flags & PF_DUMPCORE)) {
-                        eip = KSTK_EIP(task);
-                        esp = KSTK_ESP(task);
+                        if (try_get_task_stack(task)) {
+                                eip = KSTK_EIP(task);
+                                esp = KSTK_ESP(task);
+                                put_task_stack(task);
+                        }
                 }
         }
 
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index dd0f82622427..8dacaabb9f37 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -234,11 +234,11 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
         return rv;
 }
 
-static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts)
+static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts)
 {
         struct proc_dir_entry *pde = PDE(file_inode(file));
-        unsigned int rv = DEFAULT_POLLMASK;
-        unsigned int (*poll)(struct file *, struct poll_table_struct *);
+        __poll_t rv = DEFAULT_POLLMASK;
+        __poll_t (*poll)(struct file *, struct poll_table_struct *);
         if (use_pde(pde)) {
                 poll = pde->proc_fops->poll;
                 if (poll)
diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index e0f8774acd65..f0bfb45c3f9f 100644
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -40,7 +40,7 @@ static ssize_t kmsg_read(struct file *file, char __user *buf,
         return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_PROC);
 }
 
-static unsigned int kmsg_poll(struct file *file, poll_table *wait)
+static __poll_t kmsg_poll(struct file *file, poll_table *wait)
 {
         poll_wait(file, &log_wait, wait);
         if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC))
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index c5cbbdff3c3d..63325377621a 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -630,12 +630,12 @@ static int proc_sys_open(struct inode *inode, struct file *filp)
         return 0;
 }
 
-static unsigned int proc_sys_poll(struct file *filp, poll_table *wait)
+static __poll_t proc_sys_poll(struct file *filp, poll_table *wait)
 {
         struct inode *inode = file_inode(filp);
         struct ctl_table_header *head = grab_header(inode);
         struct ctl_table *table = PROC_I(inode)->sysctl_entry;
-        unsigned int ret = DEFAULT_POLLMASK;
+        __poll_t ret = DEFAULT_POLLMASK;
         unsigned long event;
 
         /* sysctl was unregistered */
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 339e4c1c044d..ec6d2983a5cb 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -47,8 +47,11 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
         if (hiwater_rss < mm->hiwater_rss)
                 hiwater_rss = mm->hiwater_rss;
 
-        text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) >> 10;
-        lib = (mm->exec_vm << (PAGE_SHIFT-10)) - text;
+        /* split executable areas between text and lib */
+        text = PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK);
+        text = min(text, mm->exec_vm << PAGE_SHIFT);
+        lib = (mm->exec_vm << PAGE_SHIFT) - text;
+
         swap = get_mm_counter(mm, MM_SWAPENTS);
         seq_printf(m,
                 "VmPeak:\t%8lu kB\n"
@@ -76,7 +79,9 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                 file << (PAGE_SHIFT-10),
                 shmem << (PAGE_SHIFT-10),
                 mm->data_vm << (PAGE_SHIFT-10),
-                mm->stack_vm << (PAGE_SHIFT-10), text, lib,
+                mm->stack_vm << (PAGE_SHIFT-10),
+                text >> 10,
+                lib >> 10,
                 mm_pgtables_bytes(mm) >> 10,
                 swap << (PAGE_SHIFT-10));
         hugetlb_report_usage(m, mm);
@@ -977,14 +982,14 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma,
 static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma,
                 unsigned long addr, pmd_t *pmdp)
 {
-        pmd_t pmd = *pmdp;
+        pmd_t old, pmd = *pmdp;
 
         if (pmd_present(pmd)) {
                 /* See comment in change_huge_pmd() */
-                pmdp_invalidate(vma, addr, pmdp);
-                if (pmd_dirty(*pmdp))
+                old = pmdp_invalidate(vma, addr, pmdp);
+                if (pmd_dirty(old))
                         pmd = pmd_mkdirty(pmd);
-                if (pmd_young(*pmdp))
+                if (pmd_young(old))
                         pmd = pmd_mkyoung(pmd);
 
                 pmd = pmd_wrprotect(pmd);