From: Mark Brown <broonie@linaro.org>
Date: Thu, 25 Jul 2013 23:01:00 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~228
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=535ad2c06cf12f3f075e3d9a141476beb367ae6b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

535ad2c06cf12f3f075e3d9a141476beb367ae6b
diff --cc drivers/cpufreq/cpufreq_governor.c
index fafeb3514669,5af40ad82d23..b6cfd55d8266
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@@ -23,9 -23,9 +23,8 @@@
  #include <linux/kernel_stat.h>
  #include <linux/mutex.h>
  #include <linux/slab.h>
 -#include <linux/tick.h>
  #include <linux/types.h>
  #include <linux/workqueue.h>
- #include <linux/cpu.h>
  
  #include "cpufreq_governor.h"
  
diff --cc drivers/cpufreq/cpufreq_stats.c
index a276fb8a8c8f,1db214b26608..7dc9c4efbcfb
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@@ -378,16 -358,9 +379,13 @@@ static int __cpuinit cpufreq_stat_cpu_c
  		cpufreq_stats_free_sysfs(cpu);
  		break;
  	case CPU_DEAD:
- 		cpufreq_stats_free_table(cpu);
- 		break;
- 	case CPU_UP_CANCELED_FROZEN:
- 		cpufreq_stats_free_sysfs(cpu);
+ 	case CPU_DEAD_FROZEN:
  		cpufreq_stats_free_table(cpu);
  		break;
 +	case CPU_DOWN_FAILED:
 +	case CPU_DOWN_FAILED_FROZEN:
 +		cpufreq_stats_create_table_cpu(cpu);
 +		break;
  	}
  	return NOTIFY_OK;
  }