diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
| commit | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (patch) | |
| tree | 7e23a0e3dde639236e019aa88309d919941958e5 /arch/arm/common/bL_switcher.c | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'arch/arm/common/bL_switcher.c')
| -rw-r--r-- | arch/arm/common/bL_switcher.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 5774b6ea7ad5..f01c0ee0c87e 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c | |||
| @@ -797,10 +797,8 @@ static int __init bL_switcher_init(void) | |||
| 797 | { | 797 | { |
| 798 | int ret; | 798 | int ret; |
| 799 | 799 | ||
| 800 | if (MAX_NR_CLUSTERS != 2) { | 800 | if (!mcpm_is_available()) |
| 801 | pr_err("%s: only dual cluster systems are supported\n", __func__); | 801 | return -ENODEV; |
| 802 | return -EINVAL; | ||
| 803 | } | ||
| 804 | 802 | ||
| 805 | cpu_notifier(bL_switcher_hotplug_callback, 0); | 803 | cpu_notifier(bL_switcher_hotplug_callback, 0); |
| 806 | 804 | ||