diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-28 19:33:37 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-28 19:33:37 -0500 |
| commit | dfd0436ad0ce139467b124c646fa65ee2635e14a (patch) | |
| tree | abf9d83c704417cdd484243c12aeffee6b185aba /arch/powerpc/platforms | |
| parent | b9818c3312da66f4b83a4a2e8650628be1237cb5 (diff) | |
| parent | 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff) | |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pasemi/cpufreq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c index 95d00173029f..890f30e70f98 100644 --- a/arch/powerpc/platforms/pasemi/cpufreq.c +++ b/arch/powerpc/platforms/pasemi/cpufreq.c | |||
| @@ -236,6 +236,13 @@ out: | |||
| 236 | 236 | ||
| 237 | static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) | 237 | static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) |
| 238 | { | 238 | { |
| 239 | /* | ||
| 240 | * We don't support CPU hotplug. Don't unmap after the system | ||
| 241 | * has already made it to a running state. | ||
| 242 | */ | ||
| 243 | if (system_state != SYSTEM_BOOTING) | ||
| 244 | return 0; | ||
| 245 | |||
| 239 | if (sdcasr_mapbase) | 246 | if (sdcasr_mapbase) |
| 240 | iounmap(sdcasr_mapbase); | 247 | iounmap(sdcasr_mapbase); |
| 241 | if (sdcpwr_mapbase) | 248 | if (sdcpwr_mapbase) |