Skip to content

Commit

Permalink
ARM: 7874/2: bL_switcher: Remove cpu_hotplug_driver_{lock,unlock}()
Browse files Browse the repository at this point in the history
Commit 6dedcca ("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>
  • Loading branch information
Tushar Behera authored and Russell King committed Nov 7, 2013
1 parent 2098990 commit b0ced9d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/arm/common/bL_switcher.c
Original file line number Diff line number Diff line change
@@ -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 @@ static int bL_switcher_enable(void)
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);
}

0 comments on commit b0ced9d

Please sign in to comment.