aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-19 12:37:20 +0100
committerMark Brown <broonie@linaro.org>2013-07-19 12:37:20 +0100
commit532e45029038c83cd1a0296ac351c246e40b5e55 (patch)
tree0eacce8def0bef3e8977083a454e822f70838b5e
parentb9f772b88e9436c112e96caf0875d272bd3def12 (diff)
parent702f80ea2f3c335b94589ec18f249542e438ffb0 (diff)
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
-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 1883c5b3e3f..8fee70dfb30 100644
--- a/arch/arm/common/bL_switcher.c
+++ b/arch/arm/common/bL_switcher.c
@@ -828,7 +828,11 @@ static int bL_switcher_hotplug_callback(struct notifier_block *nfb,
static struct notifier_block bL_switcher_hotplug_notifier =
{ &bL_switcher_hotplug_callback, NULL, 0 };
+#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)