diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:48:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:48:19 +0400 |
| commit | 3ca462b2813df4bd319588ca8a0112512f54ca24 (patch) | |
| tree | 12403ffd4b5136ab3e3010ed1ff6846e6135cdbb /drivers/cpufreq/cpufreq_stats.c | |
| parent | db26963ceff6f678070a50b4aac113b490aaa55a (diff) | |
| parent | cb5d8be972cfbea114ea56fd63ed5ce1644863df (diff) | |
Automatically merging tracking-linux-3.10.y into merge-linux-linarosamsung-linux-3.10-2013.07ll-20130717.0linux-linaro-3.10.1-2013.07
Conflicting files:
kernel/futex.c
Diffstat (limited to 'drivers/cpufreq/cpufreq_stats.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_stats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index db16c4683fe4..a276fb8a8c8f 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -371,6 +371,7 @@ 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: |