6 files changed, 18 insertions, 124 deletions

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 72b431d0a0a4..20e5c4509a43 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -21,6 +21,8 @@
 #include <linux/bitops.h>
 #include <asm/uaccess.h>
 
+#include "internal.h"
+
 static ssize_t proc_file_read(struct file *file, char __user *buf,
                               size_t nbytes, loff_t *ppos);
 static ssize_t proc_file_write(struct file *file, const char __user *buffer,
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index e6a818a93f3d..6573f31f1fd9 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -19,7 +19,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
-extern void free_proc_entry(struct proc_dir_entry *);
+#include "internal.h"
 
 static inline struct proc_dir_entry * de_get(struct proc_dir_entry *de)
 {
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 3e55198f9806..95a1cf32b838 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -37,6 +37,10 @@ extern int proc_tgid_stat(struct task_struct *, char *);
 extern int proc_pid_status(struct task_struct *, char *);
 extern int proc_pid_statm(struct task_struct *, char *);
 
+void free_proc_entry(struct proc_dir_entry *de);
+
+int proc_init_inodecache(void);
+
 static inline struct task_struct *proc_task(struct inode *inode)
 {
         return PROC_I(inode)->task;
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 5b6b0b6038a7..63bf6c00fa0c 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -323,6 +323,7 @@ static struct file_operations proc_modules_operations = {
 };
 #endif
 
+#ifdef CONFIG_SLAB
 extern struct seq_operations slabinfo_op;
 extern ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *);
 static int slabinfo_open(struct inode *inode, struct file *file)
@@ -336,6 +337,7 @@ static struct file_operations proc_slabinfo_operations = {
         .llseek         = seq_lseek,
         .release        = seq_release,
 };
+#endif
 
 static int show_stat(struct seq_file *p, void *v)
 {
@@ -600,7 +602,9 @@ void __init proc_misc_init(void)
         create_seq_entry("partitions", 0, &proc_partitions_operations);
         create_seq_entry("stat", 0, &proc_stat_operations);
         create_seq_entry("interrupts", 0, &proc_interrupts_operations);
+#ifdef CONFIG_SLAB
         create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations);
+#endif
         create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations);
         create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations);
         create_seq_entry("zoneinfo",S_IRUGO, &proc_zoneinfo_file_operations);
diff --git a/fs/proc/root.c b/fs/proc/root.c
index aef148f099a2..68896283c8ae 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -18,6 +18,8 @@
 #include <linux/bitops.h>
 #include <linux/smp_lock.h>
 
+#include "internal.h"
+
 struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver;
 
 #ifdef CONFIG_SYSCTL
@@ -36,7 +38,6 @@ static struct file_system_type proc_fs_type = {
         .kill_sb        = kill_anon_super,
 };
 
-extern int __init proc_init_inodecache(void);
 void __init proc_root_init(void)
 {
         int err = proc_init_inodecache();
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 50bd5a8f0446..0eaad41f4658 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -390,129 +390,12 @@ struct seq_operations proc_pid_smaps_op = {
 };
 
 #ifdef CONFIG_NUMA
-
-struct numa_maps {
-        unsigned long pages;
-        unsigned long anon;
-        unsigned long mapped;
-        unsigned long mapcount_max;
-        unsigned long node[MAX_NUMNODES];
-};
-
-/*
- * Calculate numa node maps for a vma
- */
-static struct numa_maps *get_numa_maps(struct vm_area_struct *vma)
-{
-        int i;
-        struct page *page;
-        unsigned long vaddr;
-        struct numa_maps *md = kmalloc(sizeof(struct numa_maps), GFP_KERNEL);
-
-        if (!md)
-                return NULL;
-        md->pages = 0;
-        md->anon = 0;
-        md->mapped = 0;
-        md->mapcount_max = 0;
-        for_each_node(i)
-                md->node[i] =0;
-
-        for (vaddr = vma->vm_start; vaddr < vma->vm_end; vaddr += PAGE_SIZE) {
-                page = follow_page(vma, vaddr, 0);
-                if (page) {
-                        int count = page_mapcount(page);
-
-                        if (count)
-                                md->mapped++;
-                        if (count > md->mapcount_max)
-                                md->mapcount_max = count;
-                        md->pages++;
-                        if (PageAnon(page))
-                                md->anon++;
-                        md->node[page_to_nid(page)]++;
-                }
-                cond_resched();
-        }
-        return md;
-}
-
-static int show_numa_map(struct seq_file *m, void *v)
-{
-        struct task_struct *task = m->private;
-        struct vm_area_struct *vma = v;
-        struct mempolicy *pol;
-        struct numa_maps *md;
-        struct zone **z;
-        int n;
-        int first;
-
-        if (!vma->vm_mm)
-                return 0;
-
-        md = get_numa_maps(vma);
-        if (!md)
-                return 0;
-
-        seq_printf(m, "%08lx", vma->vm_start);
-        pol = get_vma_policy(task, vma, vma->vm_start);
-        /* Print policy */
-        switch (pol->policy) {
-        case MPOL_PREFERRED:
-                seq_printf(m, " prefer=%d", pol->v.preferred_node);
-                break;
-        case MPOL_BIND:
-                seq_printf(m, " bind={");
-                first = 1;
-                for (z = pol->v.zonelist->zones; *z; z++) {
-
-                        if (!first)
-                                seq_putc(m, ',');
-                        else
-                                first = 0;
-                        seq_printf(m, "%d/%s", (*z)->zone_pgdat->node_id,
-                                        (*z)->name);
-                }
-                seq_putc(m, '}');
-                break;
-        case MPOL_INTERLEAVE:
-                seq_printf(m, " interleave={");
-                first = 1;
-                for_each_node(n) {
-                        if (node_isset(n, pol->v.nodes)) {
-                                if (!first)
-                                        seq_putc(m,',');
-                                else
-                                        first = 0;
-                                seq_printf(m, "%d",n);
-                        }
-                }
-                seq_putc(m, '}');
-                break;
-        default:
-                seq_printf(m," default");
-                break;
-        }
-        seq_printf(m, " MaxRef=%lu Pages=%lu Mapped=%lu",
-                        md->mapcount_max, md->pages, md->mapped);
-        if (md->anon)
-                seq_printf(m," Anon=%lu",md->anon);
-
-        for_each_online_node(n) {
-                if (md->node[n])
-                        seq_printf(m, " N%d=%lu", n, md->node[n]);
-        }
-        seq_putc(m, '\n');
-        kfree(md);
-        if (m->count < m->size)  /* vma is copied successfully */
-                m->version = (vma != get_gate_vma(task)) ? vma->vm_start : 0;
-        return 0;
-}
+extern int show_numa_map(struct seq_file *m, void *v);
 
 struct seq_operations proc_pid_numa_maps_op = {
-        .start  = m_start,
-        .next   = m_next,
-        .stop   = m_stop,
-        .show   = show_numa_map
+        .start  = m_start,
+        .next   = m_next,
+        .stop   = m_stop,
+        .show   = show_numa_map
 };
 #endif