Merge tag 'f2fs-for-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[sfrench/cifs-2.6.git] / fs / proc / meminfo.c

diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index edda898714eb7bb23585241dc6631800c6ba1dfb..568d90e17c17d4d7358ee56c544638a140538a36 100644 (file)
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -38,6 +38,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
        long cached;
        long available;
        unsigned long pages[NR_LRU_LISTS];
+       unsigned long sreclaimable, sunreclaim;
        int lru;
 
        si_meminfo(&i);
@@ -53,6 +54,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                pages[lru] = global_node_page_state(NR_LRU_BASE + lru);
 
        available = si_mem_available();
+       sreclaimable = global_node_page_state(NR_SLAB_RECLAIMABLE);
+       sunreclaim = global_node_page_state(NR_SLAB_UNRECLAIMABLE);
 
        show_val_kb(m, "MemTotal:       ", i.totalram);
        show_val_kb(m, "MemFree:        ", i.freeram);
@@ -94,14 +97,11 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
        show_val_kb(m, "Mapped:         ",
                    global_node_page_state(NR_FILE_MAPPED));
        show_val_kb(m, "Shmem:          ", i.sharedram);
-       show_val_kb(m, "Slab:           ",
-                   global_node_page_state(NR_SLAB_RECLAIMABLE) +
-                   global_node_page_state(NR_SLAB_UNRECLAIMABLE));
-
-       show_val_kb(m, "SReclaimable:   ",
-                   global_node_page_state(NR_SLAB_RECLAIMABLE));
-       show_val_kb(m, "SUnreclaim:     ",
-                   global_node_page_state(NR_SLAB_UNRECLAIMABLE));
+       show_val_kb(m, "KReclaimable:   ", sreclaimable +
+                   global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE));
+       show_val_kb(m, "Slab:           ", sreclaimable + sunreclaim);
+       show_val_kb(m, "SReclaimable:   ", sreclaimable);
+       show_val_kb(m, "SUnreclaim:     ", sunreclaim);
        seq_printf(m, "KernelStack:    %8lu kB\n",
                   global_zone_page_state(NR_KERNEL_STACK_KB));
        show_val_kb(m, "PageTables:     ",