diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-19 12:36:10 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-10-28 15:03:43 -0700 |
| commit | 124ff9d87d9a55f0b206eb88965193386672f666 (patch) | |
| tree | 0a7a35fcac8e5d81d75ee66a7cca3a66bf9a7362 | |
| parent | ed7ec30b636413c7c11bb0c13e1fee1ef38ad1bd (diff) | |
ARM: IKS: Disable IKS by default when HMP is enabledtracking-iks-llct-20131105.0tracking-iks-llct-20131028.0
Reported-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Conflicts:
arch/arm/common/bL_switcher.c
| -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 600e668b70e3..9f2fed4d4249 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c @@ -821,7 +821,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) |