1 files changed, 21 insertions, 1 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9bb314577911..72496140ac08 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -812,6 +812,7 @@ const char * const vmstat_text[] = {
 
 #ifdef CONFIG_NUMA_BALANCING
         "numa_pte_updates",
+        "numa_huge_pte_updates",
         "numa_hint_faults",
         "numa_hint_faults_local",
         "numa_pages_migrated",
@@ -1229,6 +1230,20 @@ static void start_cpu_timer(int cpu)
         schedule_delayed_work_on(cpu, work, __round_jiffies_relative(HZ, cpu));
 }
 
+static void vmstat_cpu_dead(int node)
+{
+        int cpu;
+
+        get_online_cpus();
+        for_each_online_cpu(cpu)
+                if (cpu_to_node(cpu) == node)
+                        goto end;
+
+        node_clear_state(node, N_CPU);
+end:
+        put_online_cpus();
+}
+
 /*
  * Use the cpu notifier to insure that the thresholds are recalculated
  * when necessary.
@@ -1258,6 +1273,7 @@ static int vmstat_cpuup_callback(struct notifier_block *nfb,
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
                 refresh_zone_stat_thresholds();
+                vmstat_cpu_dead(cpu_to_node(cpu));
                 break;
         default:
                 break;
@@ -1276,8 +1292,12 @@ static int __init setup_vmstat(void)
 
         register_cpu_notifier(&vmstat_notifier);
 
-        for_each_online_cpu(cpu)
+        get_online_cpus();
+        for_each_online_cpu(cpu) {
                 start_cpu_timer(cpu);
+                node_set_state(cpu_to_node(cpu), N_CPU);
+        }
+        put_online_cpus();
 #endif
 #ifdef CONFIG_PROC_FS
         proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);