Revert "ARM: bL_switcher: Allow detachment of outstanding switch requests"
This reverts commit 4725d41daea7e0cc79b3fb92af012b8cb18fccff.
This patch was dropped when the big.LITTLE switcher was submitted to the
mainline kernel because it wasn't then being used and contained a
logical flaw which meant it wouldn't have achieved what it was
attempting to do anyway. It can also produce compilation warnings in
certain configurations.
Signed-off-by: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c
index 1883c5b..2193ae7 100644
--- a/arch/arm/common/bL_switcher.c
+++ b/arch/arm/common/bL_switcher.c
@@ -404,38 +404,6 @@
EXPORT_SYMBOL_GPL(bL_switch_request_cb);
/*
- * Detach an outstanding switch request.
- *
- * The switcher will continue with the switch request in the background,
- * but the completer function will not be called.
- *
- * This may be necessary if the completer is in a kernel module which is
- * about to be unloaded.
- */
-void bL_switch_request_detach(unsigned int cpu,
- bL_switch_completion_handler completer)
-{
- struct bL_thread *t;
-
- if (cpu >= ARRAY_SIZE(bL_threads)) {
- pr_err("%s: cpu %d out of bounds\n", __func__, cpu);
- return;
- }
-
- t = &bL_threads[cpu];
-
- if (IS_ERR(t->task) || !t->task)
- return;
-
- spin_lock(&t->lock);
- if (t->completer == completer)
- t->completer = NULL;
- spin_unlock(&t->lock);
-}
-
-EXPORT_SYMBOL_GPL(bL_switch_request_detach);
-
-/*
* Activation and configuration code.
*/
diff --git a/arch/arm/include/asm/bL_switcher.h b/arch/arm/include/asm/bL_switcher.h
index 482383b..87ebcbc 100644
--- a/arch/arm/include/asm/bL_switcher.h
+++ b/arch/arm/include/asm/bL_switcher.h
@@ -40,9 +40,6 @@
#ifdef CONFIG_BL_SWITCHER
-void bL_switch_request_detach(unsigned int cpu,
- bL_switch_completion_handler completer);
-
int bL_switcher_register_notifier(struct notifier_block *nb);
int bL_switcher_unregister_notifier(struct notifier_block *nb);
@@ -61,9 +58,6 @@
int bL_switcher_get_logical_index(u32 mpidr);
#else
-static void bL_switch_request_detach(unsigned int cpu,
- bL_switch_completion_handler completer) { }
-
static inline int bL_switcher_register_notifier(struct notifier_block *nb)
{
return 0;