diff options
author | Jon Medhurst <tixy@linaro.org> | 2015-09-11 13:59:18 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2015-09-11 13:59:18 +0100 |
commit | 2ca42af5baa080df48c755d22214d444741c9481 (patch) | |
tree | 41782b384dcd0f36fa673917a91902b5406ec048 | |
parent | 59f76c990fb298722fd3ab3e3a8c00f187a2dfb5 (diff) | |
parent | 99fe6674ab80869c74211744c234d30a92fda748 (diff) |
Merge branch 'lsk-3.18-armlt-hmp' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20150911
-rw-r--r-- | arch/arm/common/bL_switcher.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 6eaddc47c43d..32d8281e6429 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c @@ -784,7 +784,11 @@ static int bL_switcher_hotplug_callback(struct notifier_block *nfb, return NOTIFY_DONE; } +#ifdef CONFIG_SCHED_HMP +static bool no_bL_switcher = true; +#else static bool no_bL_switcher; +#endif core_param(no_bL_switcher, no_bL_switcher, bool, 0644); static int __init bL_switcher_init(void) |