aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-19 12:36:10 +0100
committerJon Medhurst <tixy@linaro.org>2013-09-03 09:51:56 +0100
commitb31b666c2fb8933786c38d0275efb4e1740738c6 (patch)
tree4ae9bc19023f5bfe6f99b44e2af3a0f25266c0b9
parentc1f85268726e778a88c0d351fe93fec2eeec1ee6 (diff)
ARM: IKS: Disable IKS by default when HMP is enabledtracking-iks-llct-20130904.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)