From 2f09cfd6037dd5ff095a0a2d90f234aa6d420e35 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 21 Jan 2013 17:23:26 +0000 Subject: [PATCH] --- yaml --- r: 349323 b: refs/heads/master c: 72640d880350165c3a7b8f2e4fb4bf852ea7b606 h: refs/heads/master i: 349321: 8b4ce67dcdecdd82336b6cc014940d851a6150a6 349319: df82305a9c0188d9a57ec50e057cdf5d7002fb44 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pasemi/cpufreq.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bdf530d3f73b..cc54beab6d55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41d82bdb40af74a88cff4589ea7a60091b11070e +refs/heads/master: 72640d880350165c3a7b8f2e4fb4bf852ea7b606 diff --git a/trunk/arch/powerpc/platforms/pasemi/cpufreq.c b/trunk/arch/powerpc/platforms/pasemi/cpufreq.c index 95d00173029f..890f30e70f98 100644 --- a/trunk/arch/powerpc/platforms/pasemi/cpufreq.c +++ b/trunk/arch/powerpc/platforms/pasemi/cpufreq.c @@ -236,6 +236,13 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) { + /* + * We don't support CPU hotplug. Don't unmap after the system + * has already made it to a running state. + */ + if (system_state != SYSTEM_BOOTING) + return 0; + if (sdcasr_mapbase) iounmap(sdcasr_mapbase); if (sdcpwr_mapbase)