Commit e50caa95 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: Preserve sysfs files across suspend/resume
parents 75e1d828 a66b2e50

drivers/cpufreq/cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -1832,15 +1832,13 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb, 
	if (dev) {

		switch (action) {

		case CPU_ONLINE:

		case CPU_ONLINE_FROZEN:

			cpufreq_add_dev(dev, NULL);

			break;

		case CPU_DOWN_PREPARE:

		case CPU_DOWN_PREPARE_FROZEN:

		case CPU_UP_CANCELED_FROZEN:

			__cpufreq_remove_dev(dev, NULL);

			break;

		case CPU_DOWN_FAILED:

		case CPU_DOWN_FAILED_FROZEN:

			cpufreq_add_dev(dev, NULL);

			break;

		}

drivers/cpufreq/cpufreq_stats.c

+4 −3
Original line number Diff line number Diff line
@@ -349,15 +349,16 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb, 


	switch (action) {

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

		cpufreq_update_policy(cpu);

		break;

	case CPU_DOWN_PREPARE:

	case CPU_DOWN_PREPARE_FROZEN:

		cpufreq_stats_free_sysfs(cpu);

		break;

	case CPU_DEAD:

	case CPU_DEAD_FROZEN:

		cpufreq_stats_free_table(cpu);

		break;

	case CPU_UP_CANCELED_FROZEN:

		cpufreq_stats_free_sysfs(cpu);

		cpufreq_stats_free_table(cpu);

		break;

	}