aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-19 12:36:10 +0100
committerJon Medhurst <tixy@linaro.org>2013-11-06 09:37:51 +0000
commitab962aeee7824127d6a33d85c2c17a761ff75068 (patch)
tree6b3e33a7532bf193b08a8363deefe209eaf0076a
parentdce6c55c51bda059c1a432be803e9c8f7672ab58 (diff)
ARM: IKS: Disable IKS by default when HMP is enabledtracking-iks-llct-20131112.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.c4
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)