Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e791269d authored by Francisco Franco's avatar Francisco Franco Committed by TARKZiM
Browse files

vmstat: squash 4 patches from upstream 

Partial merge: https://github.com/torvalds/linux/commit/7c8e0181e6e0b8079c4c2ce902bf52d7a2c6fa5d
Merge: https://github.com/torvalds/linux/commit/bb0b6dffa2ccfbd9747ad0cc87c7459622896e60
Merge: https://github.com/torvalds/linux/commit/57c2e36b6f4dd52e7e90f4c748a665b13fa228d2
Partial merge: https://github.com/torvalds/linux/commit/176bed1de5bf977938cad26551969eca8f0883b1



Signed-off-by: default avatarFrancisco Franco <franciscofranco.1990@gmail.com>
parent 3b7ee175

mm/vmstat.c

+5 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void set_pgdat_percpu_threshold(pg_data_t *pgdat, 
			continue;



		threshold = (*calculate_pressure)(zone);

		for_each_possible_cpu(cpu)

		for_each_online_cpu(cpu)

			per_cpu_ptr(zone->pageset, cpu)->stat_threshold

							= threshold;

	}
@@ -1282,7 +1282,8 @@ int sysctl_stat_interval __read_mostly = HZ; 
static void vmstat_update(struct work_struct *w)

{

	refresh_cpu_vm_stats(smp_processor_id());

	schedule_delayed_work(&__get_cpu_var(vmstat_work),

	schedule_delayed_work_on(smp_processor_id(),

		this_cpu_ptr(&vmstat_work),

		round_jiffies_relative(sysctl_stat_interval));

}
@@ -1291,7 +1292,8 @@ static void __cpuinit start_cpu_timer(int cpu) 
	struct delayed_work *work = &per_cpu(vmstat_work, cpu);



	INIT_DEFERRABLE_WORK(work, vmstat_update);

	schedule_delayed_work_on(cpu, work, __round_jiffies_relative(HZ, cpu));

	schedule_delayed_work_on(cpu,

		&per_cpu(vmstat_work, cpu), 0);

}



/*