26 files changed, 142 insertions, 343 deletions

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index ab30716584f5..239493ec718e 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -27,6 +27,5 @@ proc-$(CONFIG_PROC_SYSCTL)	+= proc_sysctl.o
 proc-$(CONFIG_NET)              += proc_net.o
 proc-$(CONFIG_PROC_KCORE)       += kcore.o
 proc-$(CONFIG_PROC_VMCORE)      += vmcore.o
-proc-$(CONFIG_PROC_DEVICETREE)  += proc_devtree.o
 proc-$(CONFIG_PRINTK)   += kmsg.o
 proc-$(CONFIG_PROC_PAGE_MONITOR)        += page.o
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 1bd2077187fd..64db2bceac59 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -138,26 +138,17 @@ static const char * const task_state_array[] = {
         "D (disk sleep)",       /*   2 */
         "T (stopped)",          /*   4 */
         "t (tracing stop)",     /*   8 */
-        "Z (zombie)",           /*  16 */
-        "X (dead)",             /*  32 */
-        "x (dead)",             /*  64 */
-        "K (wakekill)",         /* 128 */
-        "W (waking)",           /* 256 */
-        "P (parked)",           /* 512 */
+        "X (dead)",             /*  16 */
+        "Z (zombie)",           /*  32 */
 };
 
 static inline const char *get_task_state(struct task_struct *tsk)
 {
-        unsigned int state = (tsk->state & TASK_REPORT) | tsk->exit_state;
-        const char * const *p = &task_state_array[0];
+        unsigned int state = (tsk->state | tsk->exit_state) & TASK_REPORT;
 
-        BUILD_BUG_ON(1 + ilog2(TASK_STATE_MAX) != ARRAY_SIZE(task_state_array));
+        BUILD_BUG_ON(1 + ilog2(TASK_REPORT) != ARRAY_SIZE(task_state_array)-1);
 
-        while (state) {
-                p++;
-                state >>= 1;
-        }
-        return *p;
+        return task_state_array[fls(state)];
 }
 
 static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
@@ -453,8 +444,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                                 min_flt += t->min_flt;
                                 maj_flt += t->maj_flt;
                                 gtime += task_gtime(t);
-                                t = next_thread(t);
-                        } while (t != task);
+                        } while_each_thread(task, t);
 
                         min_flt += sig->min_flt;
                         maj_flt += sig->maj_flt;
diff --git a/fs/proc/base.c b/fs/proc/base.c
index cfd178dc76b2..2d696b0c93bf 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1204,6 +1204,9 @@ static ssize_t proc_fault_inject_write(struct file * file,
         make_it_fail = simple_strtol(strstrip(buffer), &end, 0);
         if (*end)
                 return -EINVAL;
+        if (make_it_fail < 0 || make_it_fail > 1)
+                return -EINVAL;
+
         task = get_proc_task(file_inode(file));
         if (!task)
                 return -ESRCH;
@@ -1626,13 +1629,18 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
         return 0;
 }
 
+static inline bool proc_inode_is_dead(struct inode *inode)
+{
+        return !proc_pid(inode)->tasks[PIDTYPE_PID].first;
+}
+
 int pid_delete_dentry(const struct dentry *dentry)
 {
         /* Is the task we represent dead?
          * If so, then don't put the dentry on the lru list,
          * kill it immediately.
          */
-        return !proc_pid(dentry->d_inode)->tasks[PIDTYPE_PID].first;
+        return proc_inode_is_dead(dentry->d_inode);
 }
 
 const struct dentry_operations pid_dentry_operations =
@@ -1787,6 +1795,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
         if (rc)
                 goto out_mmput;
 
+        rc = -ENOENT;
         down_read(&mm->mmap_sem);
         vma = find_exact_vma(mm, vm_start, vm_end);
         if (vma && vma->vm_file) {
@@ -2550,7 +2559,7 @@ static const struct pid_entry tgid_base_stuff[] = {
         REG("environ",    S_IRUSR, proc_environ_operations),
         INF("auxv",       S_IRUSR, proc_pid_auxv),
         ONE("status",     S_IRUGO, proc_pid_status),
-        ONE("personality", S_IRUGO, proc_pid_personality),
+        ONE("personality", S_IRUSR, proc_pid_personality),
         INF("limits",     S_IRUGO, proc_pid_limits),
 #ifdef CONFIG_SCHED_DEBUG
         REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),
@@ -2560,7 +2569,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 #endif
         REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 #ifdef CONFIG_HAVE_ARCH_TRACEHOOK
-        INF("syscall",    S_IRUGO, proc_pid_syscall),
+        INF("syscall",    S_IRUSR, proc_pid_syscall),
 #endif
         INF("cmdline",    S_IRUGO, proc_pid_cmdline),
         ONE("stat",       S_IRUGO, proc_tgid_stat),
@@ -2579,7 +2588,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_PROC_PAGE_MONITOR
         REG("clear_refs", S_IWUSR, proc_clear_refs_operations),
         REG("smaps",      S_IRUGO, proc_pid_smaps_operations),
-        REG("pagemap",    S_IRUGO, proc_pagemap_operations),
+        REG("pagemap",    S_IRUSR, proc_pagemap_operations),
 #endif
 #ifdef CONFIG_SECURITY
         DIR("attr",       S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
@@ -2588,7 +2597,7 @@ static const struct pid_entry tgid_base_stuff[] = {
         INF("wchan",      S_IRUGO, proc_pid_wchan),
 #endif
 #ifdef CONFIG_STACKTRACE
-        ONE("stack",      S_IRUGO, proc_pid_stack),
+        ONE("stack",      S_IRUSR, proc_pid_stack),
 #endif
 #ifdef CONFIG_SCHEDSTATS
         INF("schedstat",  S_IRUGO, proc_pid_schedstat),
@@ -2889,14 +2898,14 @@ static const struct pid_entry tid_base_stuff[] = {
         REG("environ",   S_IRUSR, proc_environ_operations),
         INF("auxv",      S_IRUSR, proc_pid_auxv),
         ONE("status",    S_IRUGO, proc_pid_status),
-        ONE("personality", S_IRUGO, proc_pid_personality),
+        ONE("personality", S_IRUSR, proc_pid_personality),
         INF("limits",    S_IRUGO, proc_pid_limits),
 #ifdef CONFIG_SCHED_DEBUG
         REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_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),
+        INF("syscall",   S_IRUSR, proc_pid_syscall),
 #endif
         INF("cmdline",   S_IRUGO, proc_pid_cmdline),
         ONE("stat",      S_IRUGO, proc_tid_stat),
@@ -2917,7 +2926,7 @@ static const struct pid_entry tid_base_stuff[] = {
 #ifdef CONFIG_PROC_PAGE_MONITOR
         REG("clear_refs", S_IWUSR, proc_clear_refs_operations),
         REG("smaps",     S_IRUGO, proc_tid_smaps_operations),
-        REG("pagemap",    S_IRUGO, proc_pagemap_operations),
+        REG("pagemap",    S_IRUSR, proc_pagemap_operations),
 #endif
 #ifdef CONFIG_SECURITY
         DIR("attr",      S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
@@ -2926,7 +2935,7 @@ static const struct pid_entry tid_base_stuff[] = {
         INF("wchan",     S_IRUGO, proc_pid_wchan),
 #endif
 #ifdef CONFIG_STACKTRACE
-        ONE("stack",      S_IRUGO, proc_pid_stack),
+        ONE("stack",      S_IRUSR, proc_pid_stack),
 #endif
 #ifdef CONFIG_SCHEDSTATS
         INF("schedstat", S_IRUGO, proc_pid_schedstat),
@@ -3060,34 +3069,42 @@ out_no_task:
  * In the case of a seek we start with the leader and walk nr
  * threads past it.
  */
-static struct task_struct *first_tid(struct task_struct *leader,
-                int tid, int nr, struct pid_namespace *ns)
+static struct task_struct *first_tid(struct pid *pid, int tid, loff_t f_pos,
+                                        struct pid_namespace *ns)
 {
-        struct task_struct *pos;
+        struct task_struct *pos, *task;
+        unsigned long nr = f_pos;
+
+        if (nr != f_pos)        /* 32bit overflow? */
+                return NULL;
 
         rcu_read_lock();
-        /* Attempt to start with the pid of a thread */
-        if (tid && (nr > 0)) {
+        task = pid_task(pid, PIDTYPE_PID);
+        if (!task)
+                goto fail;
+
+        /* Attempt to start with the tid of a thread */
+        if (tid && nr) {
                 pos = find_task_by_pid_ns(tid, ns);
-                if (pos && (pos->group_leader == leader))
+                if (pos && same_thread_group(pos, task))
                         goto found;
         }
 
         /* If nr exceeds the number of threads there is nothing todo */
-        pos = NULL;
-        if (nr && nr >= get_nr_threads(leader))
-                goto out;
+        if (nr >= get_nr_threads(task))
+                goto fail;
 
         /* If we haven't found our starting place yet start
          * with the leader and walk nr threads forward.
          */
-        for (pos = leader; nr > 0; --nr) {
-                pos = next_thread(pos);
-                if (pos == leader) {
-                        pos = NULL;
-                        goto out;
-                }
-        }
+        pos = task = task->group_leader;
+        do {
+                if (!nr--)
+                        goto found;
+        } while_each_thread(task, pos);
+fail:
+        pos = NULL;
+        goto out;
 found:
         get_task_struct(pos);
 out:
@@ -3120,25 +3137,16 @@ static struct task_struct *next_tid(struct task_struct *start)
 /* for the /proc/TGID/task/ directories */
 static int proc_task_readdir(struct file *file, struct dir_context *ctx)
 {
-        struct task_struct *leader = NULL;
-        struct task_struct *task = get_proc_task(file_inode(file));
+        struct inode *inode = file_inode(file);
+        struct task_struct *task;
         struct pid_namespace *ns;
         int tid;
 
-        if (!task)
-                return -ENOENT;
-        rcu_read_lock();
-        if (pid_alive(task)) {
-                leader = task->group_leader;
-                get_task_struct(leader);
-        }
-        rcu_read_unlock();
-        put_task_struct(task);
-        if (!leader)
+        if (proc_inode_is_dead(inode))
                 return -ENOENT;
 
         if (!dir_emit_dots(file, ctx))
-                goto out;
+                return 0;
 
         /* f_version caches the tgid value that the last readdir call couldn't
          * return. lseek aka telldir automagically resets f_version to 0.
@@ -3146,7 +3154,7 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)
         ns = file->f_dentry->d_sb->s_fs_info;
         tid = (int)file->f_version;
         file->f_version = 0;
-        for (task = first_tid(leader, tid, ctx->pos - 2, ns);
+        for (task = first_tid(proc_pid(inode), tid, ctx->pos - 2, ns);
              task;
              task = next_tid(task), ctx->pos++) {
                 char name[PROC_NUMBUF];
@@ -3162,8 +3170,7 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)
                         break;
                 }
         }
-out:
-        put_task_struct(leader);
+
         return 0;
 }
 
diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
index 82676e3fcd1d..cbd82dff7e81 100644
--- a/fs/proc/cmdline.c
+++ b/fs/proc/cmdline.c
@@ -26,4 +26,4 @@ static int __init proc_cmdline_init(void)
         proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
         return 0;
 }
-module_init(proc_cmdline_init);
+fs_initcall(proc_cmdline_init);
diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c
index 51942d5abcec..290ba85cb900 100644
--- a/fs/proc/consoles.c
+++ b/fs/proc/consoles.c
@@ -109,4 +109,4 @@ static int __init proc_consoles_init(void)
         proc_create("consoles", 0, NULL, &proc_consoles_operations);
         return 0;
 }
-module_init(proc_consoles_init);
+fs_initcall(proc_consoles_init);
diff --git a/fs/proc/cpuinfo.c b/fs/proc/cpuinfo.c
index 5a1e539a234b..06f4d31e0396 100644
--- a/fs/proc/cpuinfo.c
+++ b/fs/proc/cpuinfo.c
@@ -21,4 +21,4 @@ static int __init proc_cpuinfo_init(void)
         proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations);
         return 0;
 }
-module_init(proc_cpuinfo_init);
+fs_initcall(proc_cpuinfo_init);
diff --git a/fs/proc/devices.c b/fs/proc/devices.c
index b14347167c35..50493edc30e5 100644
--- a/fs/proc/devices.c
+++ b/fs/proc/devices.c
@@ -67,4 +67,4 @@ static int __init proc_devices_init(void)
         proc_create("devices", 0, NULL, &proc_devinfo_operations);
         return 0;
 }
-module_init(proc_devices_init);
+fs_initcall(proc_devices_init);
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 985ea881b5bc..0788d093f5d8 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -11,6 +11,7 @@
 
 #include <linux/proc_fs.h>
 
+#include "../mount.h"
 #include "internal.h"
 #include "fd.h"
 
@@ -48,8 +49,9 @@ static int seq_show(struct seq_file *m, void *v)
         }
 
         if (!ret) {
-                seq_printf(m, "pos:\t%lli\nflags:\t0%o\n",
-                           (long long)file->f_pos, f_flags);
+                seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
+                           (long long)file->f_pos, f_flags,
+                           real_mount(file->f_path.mnt)->mnt_id);
                 if (file->f_op->show_fdinfo)
                         ret = file->f_op->show_fdinfo(m, file);
                 fput(file);
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index cca93b6fb9a9..b7f268eb5f45 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -49,8 +49,7 @@ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
         setattr_copy(inode, iattr);
         mark_inode_dirty(inode);
 
-        de->uid = inode->i_uid;
-        de->gid = inode->i_gid;
+        proc_set_user(de, inode->i_uid, inode->i_gid);
         de->mode = inode->i_mode;
         return 0;
 }
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 124fc43c7090..0adbc02d60e3 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -35,7 +35,7 @@ static void proc_evict_inode(struct inode *inode)
         const struct proc_ns_operations *ns_ops;
         void *ns;
 
-        truncate_inode_pages(&inode->i_data, 0);
+        truncate_inode_pages_final(&inode->i_data);
         clear_inode(inode);
 
         /* Stop tracking associated processes */
@@ -47,7 +47,7 @@ static void proc_evict_inode(struct inode *inode)
                 pde_put(de);
         head = PROC_I(inode)->sysctl;
         if (head) {
-                rcu_assign_pointer(PROC_I(inode)->sysctl, NULL);
+                RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
                 sysctl_head_put(head);
         }
         /* Release any associated namespace */
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 651d09a11dde..3ab6d14e71c5 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -211,13 +211,6 @@ extern int proc_fill_super(struct super_block *);
 extern void proc_entry_rundown(struct proc_dir_entry *);
 
 /*
- * proc_devtree.c
- */
-#ifdef CONFIG_PROC_DEVICETREE
-extern void proc_device_tree_init(void);
-#endif
-
-/*
  * proc_namespaces.c
  */
 extern const struct inode_operations proc_ns_dir_inode_operations;
diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
index 05029c0e2f24..a352d5703b41 100644
--- a/fs/proc/interrupts.c
+++ b/fs/proc/interrupts.c
@@ -50,4 +50,4 @@ static int __init proc_interrupts_init(void)
         proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
         return 0;
 }
-module_init(proc_interrupts_init);
+fs_initcall(proc_interrupts_init);
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index 5ed0e52d6aa0..39e6ef32f0bd 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -639,4 +639,4 @@ static int __init proc_kcore_init(void)
 
         return 0;
 }
-module_init(proc_kcore_init);
+fs_initcall(proc_kcore_init);
diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index bdfabdaefdce..05f8dcdb086e 100644
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -61,4 +61,4 @@ static int __init proc_kmsg_init(void)
         proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations);
         return 0;
 }
-module_init(proc_kmsg_init);
+fs_initcall(proc_kmsg_init);
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c
index 1afa4dd4cae2..aec66e6c2060 100644
--- a/fs/proc/loadavg.c
+++ b/fs/proc/loadavg.c
@@ -42,4 +42,4 @@ static int __init proc_loadavg_init(void)
         proc_create("loadavg", 0, NULL, &loadavg_proc_fops);
         return 0;
 }
-module_init(proc_loadavg_init);
+fs_initcall(proc_loadavg_init);
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index a77d2b299199..7445af0b1aa3 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -26,7 +26,11 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
         unsigned long committed;
         struct vmalloc_info vmi;
         long cached;
+        long available;
+        unsigned long pagecache;
+        unsigned long wmark_low = 0;
         unsigned long pages[NR_LRU_LISTS];
+        struct zone *zone;
         int lru;
 
 /*
@@ -47,12 +51,44 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
         for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++)
                 pages[lru] = global_page_state(NR_LRU_BASE + lru);
 
+        for_each_zone(zone)
+                wmark_low += zone->watermark[WMARK_LOW];
+
+        /*
+         * Estimate the amount of memory available for userspace allocations,
+         * without causing swapping.
+         *
+         * Free memory cannot be taken below the low watermark, before the
+         * system starts swapping.
+         */
+        available = i.freeram - wmark_low;
+
+        /*
+         * Not all the page cache can be freed, otherwise the system will
+         * start swapping. Assume at least half of the page cache, or the
+         * low watermark worth of cache, needs to stay.
+         */
+        pagecache = pages[LRU_ACTIVE_FILE] + pages[LRU_INACTIVE_FILE];
+        pagecache -= min(pagecache / 2, wmark_low);
+        available += pagecache;
+
+        /*
+         * Part of the reclaimable slab consists of items that are in use,
+         * and cannot be freed. Cap this estimate at the low watermark.
+         */
+        available += global_page_state(NR_SLAB_RECLAIMABLE) -
+                     min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low);
+
+        if (available < 0)
+                available = 0;
+
         /*
          * Tagged format, for easy grepping and expansion.
          */
         seq_printf(m,
                 "MemTotal:       %8lu kB\n"
                 "MemFree:        %8lu kB\n"
+                "MemAvailable:   %8lu kB\n"
                 "Buffers:        %8lu kB\n"
                 "Cached:         %8lu kB\n"
                 "SwapCached:     %8lu kB\n"
@@ -105,6 +141,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                 ,
                 K(i.totalram),
                 K(i.freeram),
+                K(available),
                 K(i.bufferram),
                 K(cached),
                 K(total_swapcache_pages()),
@@ -183,4 +220,4 @@ static int __init proc_meminfo_init(void)
         proc_create("meminfo", 0, NULL, &meminfo_proc_fops);
         return 0;
 }
-module_init(proc_meminfo_init);
+fs_initcall(proc_meminfo_init);
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index 5f9bc8a746c9..d4a35746cab9 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -131,4 +131,4 @@ static int __init proc_nommu_init(void)
         return 0;
 }
 
-module_init(proc_nommu_init);
+fs_initcall(proc_nommu_init);
diff --git a/fs/proc/page.c b/fs/proc/page.c
index b8730d9ebaee..e647c55275d9 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -118,10 +118,11 @@ u64 stable_page_flags(struct page *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.
+         * just checks PG_head/PG_tail, so we need to check PageLRU/PageAnon
+         * to make sure a given page is a thp, not a non-huge compound page.
          */
-        else if (PageTransCompound(page) && PageLRU(compound_trans_head(page)))
+        else if (PageTransCompound(page) && (PageLRU(compound_head(page)) ||
+                                             PageAnon(compound_head(page))))
                 u |= 1 << KPF_THP;
 
         /*
@@ -217,4 +218,4 @@ static int __init proc_page_init(void)
         proc_create("kpageflags", S_IRUSR, NULL, &proc_kpageflags_operations);
         return 0;
 }
-module_init(proc_page_init);
+fs_initcall(proc_page_init);
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
deleted file mode 100644
index 70779b2fc209..000000000000
--- a/fs/proc/proc_devtree.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * proc_devtree.c - handles /proc/device-tree
- *
- * Copyright 1997 Paul Mackerras
- */
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/printk.h>
-#include <linux/stat.h>
-#include <linux/string.h>
-#include <linux/of.h>
-#include <linux/export.h>
-#include <linux/slab.h>
-#include <asm/uaccess.h>
-#include "internal.h"
-
-static inline void set_node_proc_entry(struct device_node *np,
-                                       struct proc_dir_entry *de)
-{
-        np->pde = de;
-}
-
-static struct proc_dir_entry *proc_device_tree;
-
-/*
- * Supply data on a read from /proc/device-tree/node/property.
- */
-static int property_proc_show(struct seq_file *m, void *v)
-{
-        struct property *pp = m->private;
-
-        seq_write(m, pp->value, pp->length);
-        return 0;
-}
-
-static int property_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, property_proc_show, __PDE_DATA(inode));
-}
-
-static const struct file_operations property_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = property_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*
- * For a node with a name like "gc@10", we make symlinks called "gc"
- * and "@10" to it.
- */
-
-/*
- * Add a property to a node
- */
-static struct proc_dir_entry *
-__proc_device_tree_add_prop(struct proc_dir_entry *de, struct property *pp,
-                const char *name)
-{
-        struct proc_dir_entry *ent;
-
-        /*
-         * Unfortunately proc_register puts each new entry
-         * at the beginning of the list.  So we rearrange them.
-         */
-        ent = proc_create_data(name,
-                               strncmp(name, "security-", 9) ? S_IRUGO : S_IRUSR,
-                               de, &property_proc_fops, pp);
-        if (ent == NULL)
-                return NULL;
-
-        if (!strncmp(name, "security-", 9))
-                ent->size = 0; /* don't leak number of password chars */
-        else
-                ent->size = pp->length;
-
-        return ent;
-}
-
-
-void proc_device_tree_add_prop(struct proc_dir_entry *pde, struct property *prop)
-{
-        __proc_device_tree_add_prop(pde, prop, prop->name);
-}
-
-void proc_device_tree_remove_prop(struct proc_dir_entry *pde,
-                                  struct property *prop)
-{
-        remove_proc_entry(prop->name, pde);
-}
-
-void proc_device_tree_update_prop(struct proc_dir_entry *pde,
-                                  struct property *newprop,
-                                  struct property *oldprop)
-{
-        struct proc_dir_entry *ent;
-
-        if (!oldprop) {
-                proc_device_tree_add_prop(pde, newprop);
-                return;
-        }
-
-        for (ent = pde->subdir; ent != NULL; ent = ent->next)
-                if (ent->data == oldprop)
-                        break;
-        if (ent == NULL) {
-                pr_warn("device-tree: property \"%s\" does not exist\n",
-                        oldprop->name);
-        } else {
-                ent->data = newprop;
-                ent->size = newprop->length;
-        }
-}
-
-/*
- * Various dodgy firmware might give us nodes and/or properties with
- * conflicting names. That's generally ok, except for exporting via /proc,
- * so munge names here to ensure they're unique.
- */
-
-static int duplicate_name(struct proc_dir_entry *de, const char *name)
-{
-        struct proc_dir_entry *ent;
-        int found = 0;
-
-        spin_lock(&proc_subdir_lock);
-
-        for (ent = de->subdir; ent != NULL; ent = ent->next) {
-                if (strcmp(ent->name, name) == 0) {
-                        found = 1;
-                        break;
-                }
-        }
-
-        spin_unlock(&proc_subdir_lock);
-
-        return found;
-}
-
-static const char *fixup_name(struct device_node *np, struct proc_dir_entry *de,
-                const char *name)
-{
-        char *fixed_name;
-        int fixup_len = strlen(name) + 2 + 1; /* name + #x + \0 */
-        int i = 1, size;
-
-realloc:
-        fixed_name = kmalloc(fixup_len, GFP_KERNEL);
-        if (fixed_name == NULL) {
-                pr_err("device-tree: Out of memory trying to fixup "
-                       "name \"%s\"\n", name);
-                return name;
-        }
-
-retry:
-        size = snprintf(fixed_name, fixup_len, "%s#%d", name, i);
-        size++; /* account for NULL */
-
-        if (size > fixup_len) {
-                /* We ran out of space, free and reallocate. */
-                kfree(fixed_name);
-                fixup_len = size;
-                goto realloc;
-        }
-
-        if (duplicate_name(de, fixed_name)) {
-                /* Multiple duplicates. Retry with a different offset. */
-                i++;
-                goto retry;
-        }
-
-        pr_warn("device-tree: Duplicate name in %s, renamed to \"%s\"\n",
-                np->full_name, fixed_name);
-
-        return fixed_name;
-}
-
-/*
- * Process a node, adding entries for its children and its properties.
- */
-void proc_device_tree_add_node(struct device_node *np,
-                               struct proc_dir_entry *de)
-{
-        struct property *pp;
-        struct proc_dir_entry *ent;
-        struct device_node *child;
-        const char *p;
-
-        set_node_proc_entry(np, de);
-        for (child = NULL; (child = of_get_next_child(np, child));) {
-                /* Use everything after the last slash, or the full name */
-                p = kbasename(child->full_name);
-
-                if (duplicate_name(de, p))
-                        p = fixup_name(np, de, p);
-
-                ent = proc_mkdir(p, de);
-                if (ent == NULL)
-                        break;
-                proc_device_tree_add_node(child, ent);
-        }
-        of_node_put(child);
-
-        for (pp = np->properties; pp != NULL; pp = pp->next) {
-                p = pp->name;
-
-                if (strchr(p, '/'))
-                        continue;
-
-                if (duplicate_name(de, p))
-                        p = fixup_name(np, de, p);
-
-                ent = __proc_device_tree_add_prop(de, pp, p);
-                if (ent == NULL)
-                        break;
-        }
-}
-
-/*
- * Called on initialization to set up the /proc/device-tree subtree
- */
-void __init proc_device_tree_init(void)
-{
-        struct device_node *root;
-
-        proc_device_tree = proc_mkdir("device-tree", NULL);
-        if (proc_device_tree == NULL)
-                return;
-        root = of_find_node_by_path("/");
-        if (root == NULL) {
-                pr_debug("/proc/device-tree: can't find root\n");
-                return;
-        }
-        proc_device_tree_add_node(root, proc_device_tree);
-        of_node_put(root);
-}
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 87dbcbef7fe4..5dbadecb234d 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -92,6 +92,8 @@ static int proc_parse_options(char *options, struct pid_namespace *pid)
 int proc_remount(struct super_block *sb, int *flags, char *data)
 {
         struct pid_namespace *pid = sb->s_fs_info;
+
+        sync_filesystem(sb);
         return !proc_parse_options(data, pid);
 }
 
@@ -183,9 +185,6 @@ void __init proc_root_init(void)
         proc_mkdir("openprom", NULL);
 #endif
         proc_tty_init();
-#ifdef CONFIG_PROC_DEVICETREE
-        proc_device_tree_init();
-#endif
         proc_mkdir("bus", NULL);
         proc_sys_init();
 }
diff --git a/fs/proc/softirqs.c b/fs/proc/softirqs.c
index 62604be9f58d..ad8a77f94beb 100644
--- a/fs/proc/softirqs.c
+++ b/fs/proc/softirqs.c
@@ -41,4 +41,4 @@ static int __init proc_softirqs_init(void)
         proc_create("softirqs", 0, NULL, &proc_softirqs_operations);
         return 0;
 }
-module_init(proc_softirqs_init);
+fs_initcall(proc_softirqs_init);
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 1cf86c0e8689..9d231e9e5f0e 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -9,7 +9,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/irqnr.h>
-#include <asm/cputime.h>
+#include <linux/cputime.h>
 #include <linux/tick.h>
 
 #ifndef arch_irq_stat_cpu
@@ -221,4 +221,4 @@ static int __init proc_stat_init(void)
         proc_create("stat", 0, NULL, &proc_stat_operations);
         return 0;
 }
-module_init(proc_stat_init);
+fs_initcall(proc_stat_init);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index fb52b548080d..442177b1119a 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1,4 +1,5 @@
 #include <linux/mm.h>
+#include <linux/vmacache.h>
 #include <linux/hugetlb.h>
 #include <linux/huge_mm.h>
 #include <linux/mount.h>
@@ -152,7 +153,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
 
         /*
          * We remember last_addr rather than next_addr to hit with
-         * mmap_cache most of the time. We have zero last_addr at
+         * vmacache most of the time. We have zero last_addr at
          * the beginning and also after lseek. We will have -1 last_addr
          * after the end of the vmas.
          */
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 061894625903..33de567c25af 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -5,7 +5,7 @@
 #include <linux/seq_file.h>
 #include <linux/time.h>
 #include <linux/kernel_stat.h>
-#include <asm/cputime.h>
+#include <linux/cputime.h>
 
 static int uptime_proc_show(struct seq_file *m, void *v)
 {
@@ -49,4 +49,4 @@ static int __init proc_uptime_init(void)
         proc_create("uptime", 0, NULL, &uptime_proc_fops);
         return 0;
 }
-module_init(proc_uptime_init);
+fs_initcall(proc_uptime_init);
diff --git a/fs/proc/version.c b/fs/proc/version.c
index 76817a60678c..d2154eb6d78f 100644
--- a/fs/proc/version.c
+++ b/fs/proc/version.c
@@ -31,4 +31,4 @@ static int __init proc_version_init(void)
         proc_create("version", 0, NULL, &version_proc_fops);
         return 0;
 }
-module_init(proc_version_init);
+fs_initcall(proc_version_init);
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 9100d6959886..6a8e785b29da 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -468,17 +468,23 @@ static int __init update_note_header_size_elf64(const Elf64_Ehdr *ehdr_ptr)
                         return rc;
                 }
                 nhdr_ptr = notes_section;
-                while (real_sz < max_sz) {
-                        if (nhdr_ptr->n_namesz == 0)
-                                break;
+                while (nhdr_ptr->n_namesz != 0) {
                         sz = sizeof(Elf64_Nhdr) +
                                 ((nhdr_ptr->n_namesz + 3) & ~3) +
                                 ((nhdr_ptr->n_descsz + 3) & ~3);
+                        if ((real_sz + sz) > max_sz) {
+                                pr_warn("Warning: Exceeded p_memsz, dropping PT_NOTE entry n_namesz=0x%x, n_descsz=0x%x\n",
+                                        nhdr_ptr->n_namesz, nhdr_ptr->n_descsz);
+                                break;
+                        }
                         real_sz += sz;
                         nhdr_ptr = (Elf64_Nhdr*)((char*)nhdr_ptr + sz);
                 }
                 kfree(notes_section);
                 phdr_ptr->p_memsz = real_sz;
+                if (real_sz == 0) {
+                        pr_warn("Warning: Zero PT_NOTE entries found\n");
+                }
         }
 
         return 0;
@@ -648,17 +654,23 @@ static int __init update_note_header_size_elf32(const Elf32_Ehdr *ehdr_ptr)
                         return rc;
                 }
                 nhdr_ptr = notes_section;
-                while (real_sz < max_sz) {
-                        if (nhdr_ptr->n_namesz == 0)
-                                break;
+                while (nhdr_ptr->n_namesz != 0) {
                         sz = sizeof(Elf32_Nhdr) +
                                 ((nhdr_ptr->n_namesz + 3) & ~3) +
                                 ((nhdr_ptr->n_descsz + 3) & ~3);
+                        if ((real_sz + sz) > max_sz) {
+                                pr_warn("Warning: Exceeded p_memsz, dropping PT_NOTE entry n_namesz=0x%x, n_descsz=0x%x\n",
+                                        nhdr_ptr->n_namesz, nhdr_ptr->n_descsz);
+                                break;
+                        }
                         real_sz += sz;
                         nhdr_ptr = (Elf32_Nhdr*)((char*)nhdr_ptr + sz);
                 }
                 kfree(notes_section);
                 phdr_ptr->p_memsz = real_sz;
+                if (real_sz == 0) {
+                        pr_warn("Warning: Zero PT_NOTE entries found\n");
+                }
         }
 
         return 0;
@@ -1082,7 +1094,7 @@ static int __init vmcore_init(void)
                 proc_vmcore->size = vmcore_size;
         return 0;
 }
-module_init(vmcore_init)
+fs_initcall(vmcore_init);
 
 /* Cleanup function for vmcore module. */
 void vmcore_cleanup(void)
@@ -1104,4 +1116,3 @@ void vmcore_cleanup(void)
         }
         free_elfcorebuf();
 }
-EXPORT_SYMBOL_GPL(vmcore_cleanup);