summaryrefslogtreecommitdiff
path: root/arch/arm/common
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-10-31 06:46:14 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-11-07 00:14:14 +0000
commitb0ced9d220f78f27b93e4d1024b3865ba172dbce (patch)
treed08e7e8cd9ad0eb82bd1261e3bb97c7312d4aa54 /arch/arm/common
parent2098990e7c558c175b96213d41058983e00a7919 (diff)
ARM: 7874/2: bL_switcher: Remove cpu_hotplug_driver_{lock,unlock}()
Commit 6dedcca610c6 ("hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock())" removes the the definition of cpu_hotplug_driver_{lock,unlock} APIs, thereby causing a build error. Replace these calls with {lock,unlock}_device_hotplug(). Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/bL_switcher.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c
index 63bbc4f70564..5774b6ea7ad5 100644
--- a/arch/arm/common/bL_switcher.c
+++ b/arch/arm/common/bL_switcher.c
@@ -577,9 +577,9 @@ static int bL_switcher_enable(void)
int cpu, ret;
mutex_lock(&bL_switcher_activation_lock);
- cpu_hotplug_driver_lock();
+ lock_device_hotplug();
if (bL_switcher_active) {
- cpu_hotplug_driver_unlock();
+ unlock_device_hotplug();
mutex_unlock(&bL_switcher_activation_lock);
return 0;
}
@@ -615,7 +615,7 @@ error:
bL_activation_notify(BL_NOTIFY_POST_DISABLE);
out:
- cpu_hotplug_driver_unlock();
+ unlock_device_hotplug();
mutex_unlock(&bL_switcher_activation_lock);
return ret;
}
@@ -629,7 +629,7 @@ static void bL_switcher_disable(void)
struct task_struct *task;
mutex_lock(&bL_switcher_activation_lock);
- cpu_hotplug_driver_lock();
+ lock_device_hotplug();
if (!bL_switcher_active)
goto out;
@@ -685,7 +685,7 @@ static void bL_switcher_disable(void)
bL_activation_notify(BL_NOTIFY_POST_DISABLE);
out:
- cpu_hotplug_driver_unlock();
+ unlock_device_hotplug();
mutex_unlock(&bL_switcher_activation_lock);
}