This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / proc / proc_misc.c

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 1c4f019..3ee238d 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -44,7 +44,6 @@
 #include <linux/jiffies.h>
 #include <linux/sysrq.h>
 #include <linux/vmalloc.h>
-#include <linux/crash_dump.h>
 #include <linux/vs_base.h>
 #include <linux/vs_cvirt.h>
 
@@ -54,8 +53,6 @@
 #include <asm/tlb.h>
 #include <asm/div64.h>
 
-#include <linux/vs_cvirt.h>
-
 #define LOAD_INT(x) ((x) >> FSHIFT)
 #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
 /*
@@ -177,14 +174,12 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                                 int count, int *eof, void *data)
 {
        struct sysinfo i;
-       int len;
+       int len, committed;
        struct page_state ps;
        unsigned long inactive;
        unsigned long active;
        unsigned long free;
        unsigned long vmtot;
-       unsigned long committed;
-       unsigned long allowed;
        struct vmalloc_info vmi;
 
        get_page_state(&ps);
@@ -197,8 +192,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
        si_meminfo(&i);
        si_swapinfo(&i);
        committed = atomic_read(&vm_committed_space);
-       allowed = ((totalram_pages - hugetlb_total_pages())
-               * sysctl_overcommit_ratio / 100) + total_swap_pages;
 
        vmtot = (VMALLOC_END-VMALLOC_START)>>10;
        vmi = get_vmalloc_info();
@@ -226,8 +219,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                "Writeback:    %8lu kB\n"
                "Mapped:       %8lu kB\n"
                "Slab:         %8lu kB\n"
-               "CommitLimit:  %8lu kB\n"
-               "Committed_AS: %8lu kB\n"
+               "Committed_AS: %8u kB\n"
                "PageTables:   %8lu kB\n"
                "VmallocTotal: %8lu kB\n"
                "VmallocUsed:  %8lu kB\n"
@@ -249,7 +241,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                K(ps.nr_writeback),
                K(ps.nr_mapped),
                K(ps.nr_slab),
-               K(allowed),
                K(committed),
                K(ps.nr_page_table_pages),
                vmtot,
@@ -658,13 +649,11 @@ void __init proc_misc_init(void)
                                (size_t)high_memory - PAGE_OFFSET + PAGE_SIZE;
        }
 #endif
-       crash_create_proc_entry();
 #ifdef CONFIG_MAGIC_SYSRQ
        entry = create_proc_entry("sysrq-trigger", S_IWUSR, NULL);
        if (entry)
                entry->proc_fops = &proc_sysrq_trigger_operations;
 #endif
-       crash_enable_by_proc();
 #ifdef CONFIG_PPC32
        {
                extern struct file_operations ppc_htab_operations;