diff options
Diffstat (limited to 'fs/proc/task_mmu.c')
-rw-r--r-- | fs/proc/task_mmu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 6744bd706ecf..875231c36cb3 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | void task_mem(struct seq_file *m, struct mm_struct *mm) | 27 | void task_mem(struct seq_file *m, struct mm_struct *mm) |
28 | { | 28 | { |
29 | unsigned long text, lib, swap, ptes, pmds, anon, file, shmem; | 29 | unsigned long text, lib, swap, anon, file, shmem; |
30 | unsigned long hiwater_vm, total_vm, hiwater_rss, total_rss; | 30 | unsigned long hiwater_vm, total_vm, hiwater_rss, total_rss; |
31 | 31 | ||
32 | anon = get_mm_counter(mm, MM_ANONPAGES); | 32 | anon = get_mm_counter(mm, MM_ANONPAGES); |
@@ -50,8 +50,6 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) | |||
50 | text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) >> 10; | 50 | text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) >> 10; |
51 | lib = (mm->exec_vm << (PAGE_SHIFT-10)) - text; | 51 | lib = (mm->exec_vm << (PAGE_SHIFT-10)) - text; |
52 | swap = get_mm_counter(mm, MM_SWAPENTS); | 52 | swap = get_mm_counter(mm, MM_SWAPENTS); |
53 | ptes = PTRS_PER_PTE * sizeof(pte_t) * atomic_long_read(&mm->nr_ptes); | ||
54 | pmds = PTRS_PER_PMD * sizeof(pmd_t) * mm_nr_pmds(mm); | ||
55 | seq_printf(m, | 53 | seq_printf(m, |
56 | "VmPeak:\t%8lu kB\n" | 54 | "VmPeak:\t%8lu kB\n" |
57 | "VmSize:\t%8lu kB\n" | 55 | "VmSize:\t%8lu kB\n" |
@@ -67,7 +65,6 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) | |||
67 | "VmExe:\t%8lu kB\n" | 65 | "VmExe:\t%8lu kB\n" |
68 | "VmLib:\t%8lu kB\n" | 66 | "VmLib:\t%8lu kB\n" |
69 | "VmPTE:\t%8lu kB\n" | 67 | "VmPTE:\t%8lu kB\n" |
70 | "VmPMD:\t%8lu kB\n" | ||
71 | "VmSwap:\t%8lu kB\n", | 68 | "VmSwap:\t%8lu kB\n", |
72 | hiwater_vm << (PAGE_SHIFT-10), | 69 | hiwater_vm << (PAGE_SHIFT-10), |
73 | total_vm << (PAGE_SHIFT-10), | 70 | total_vm << (PAGE_SHIFT-10), |
@@ -80,8 +77,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) | |||
80 | shmem << (PAGE_SHIFT-10), | 77 | shmem << (PAGE_SHIFT-10), |
81 | mm->data_vm << (PAGE_SHIFT-10), | 78 | mm->data_vm << (PAGE_SHIFT-10), |
82 | mm->stack_vm << (PAGE_SHIFT-10), text, lib, | 79 | mm->stack_vm << (PAGE_SHIFT-10), text, lib, |
83 | ptes >> 10, | 80 | mm_pgtables_bytes(mm) >> 10, |
84 | pmds >> 10, | ||
85 | swap << (PAGE_SHIFT-10)); | 81 | swap << (PAGE_SHIFT-10)); |
86 | hugetlb_report_usage(m, mm); | 82 | hugetlb_report_usage(m, mm); |
87 | } | 83 | } |