diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-10-31 01:46:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-06 19:14:14 -0500 |
commit | b0ced9d220f78f27b93e4d1024b3865ba172dbce (patch) | |
tree | d08e7e8cd9ad0eb82bd1261e3bb97c7312d4aa54 /arch | |
parent | 2098990e7c558c175b96213d41058983e00a7919 (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')
-rw-r--r-- | arch/arm/common/bL_switcher.c | 10 |
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) | |||
577 | int cpu, ret; | 577 | int cpu, ret; |
578 | 578 | ||
579 | mutex_lock(&bL_switcher_activation_lock); | 579 | mutex_lock(&bL_switcher_activation_lock); |
580 | cpu_hotplug_driver_lock(); | 580 | lock_device_hotplug(); |
581 | if (bL_switcher_active) { | 581 | if (bL_switcher_active) { |
582 | cpu_hotplug_driver_unlock(); | 582 | unlock_device_hotplug(); |
583 | mutex_unlock(&bL_switcher_activation_lock); | 583 | mutex_unlock(&bL_switcher_activation_lock); |
584 | return 0; | 584 | return 0; |
585 | } | 585 | } |
@@ -615,7 +615,7 @@ error: | |||
615 | bL_activation_notify(BL_NOTIFY_POST_DISABLE); | 615 | bL_activation_notify(BL_NOTIFY_POST_DISABLE); |
616 | 616 | ||
617 | out: | 617 | out: |
618 | cpu_hotplug_driver_unlock(); | 618 | unlock_device_hotplug(); |
619 | mutex_unlock(&bL_switcher_activation_lock); | 619 | mutex_unlock(&bL_switcher_activation_lock); |
620 | return ret; | 620 | return ret; |
621 | } | 621 | } |
@@ -629,7 +629,7 @@ static void bL_switcher_disable(void) | |||
629 | struct task_struct *task; | 629 | struct task_struct *task; |
630 | 630 | ||
631 | mutex_lock(&bL_switcher_activation_lock); | 631 | mutex_lock(&bL_switcher_activation_lock); |
632 | cpu_hotplug_driver_lock(); | 632 | lock_device_hotplug(); |
633 | 633 | ||
634 | if (!bL_switcher_active) | 634 | if (!bL_switcher_active) |
635 | goto out; | 635 | goto out; |
@@ -685,7 +685,7 @@ static void bL_switcher_disable(void) | |||
685 | bL_activation_notify(BL_NOTIFY_POST_DISABLE); | 685 | bL_activation_notify(BL_NOTIFY_POST_DISABLE); |
686 | 686 | ||
687 | out: | 687 | out: |
688 | cpu_hotplug_driver_unlock(); | 688 | unlock_device_hotplug(); |
689 | mutex_unlock(&bL_switcher_activation_lock); | 689 | mutex_unlock(&bL_switcher_activation_lock); |
690 | } | 690 | } |
691 | 691 | ||