Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index def5dd2fbe6124401e392a0438a062acf0140f81..302dd076b8bf47bfb13a7925166b1b1f4e0dc5eb 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -770,6 +770,9 @@ const char * const vmstat_text[] = {
        "numa_local",
        "numa_other",
 #endif
+       "workingset_refault",
+       "workingset_activate",
+       "workingset_nodereclaim",
        "nr_anon_transparent_hugepages",
        "nr_free_cma",
        "nr_dirty_threshold",
@@ -810,6 +813,9 @@ const char * const vmstat_text[] = {
 
        "pgrotated",
 
+       "drop_pagecache",
+       "drop_slab",
+
 #ifdef CONFIG_NUMA_BALANCING
        "numa_pte_updates",
        "numa_huge_pte_updates",
@@ -1292,14 +1298,14 @@ static int __init setup_vmstat(void)
 #ifdef CONFIG_SMP
        int cpu;
 
-       register_cpu_notifier(&vmstat_notifier);
+       cpu_notifier_register_begin();
+       __register_cpu_notifier(&vmstat_notifier);
 
-       get_online_cpus();
        for_each_online_cpu(cpu) {
                start_cpu_timer(cpu);
                node_set_state(cpu_to_node(cpu), N_CPU);
        }
-       put_online_cpus();
+       cpu_notifier_register_done();
 #endif
 #ifdef CONFIG_PROC_FS
        proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);