aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst (Tixy) <tixy@linaro.org>2013-12-09 14:49:24 +0000
committerMark Brown <broonie@linaro.org>2013-12-11 10:57:37 +0000
commita812d77fc04bc55341cfd79d4f0273547798ddbb (patch)
treef2483ec9fc7e11f8b19a2cf974fb72352ad2e470
parent20ce13dacdefe4d429217e710bf5461a4c6d1cf9 (diff)
downloadlinux-linaro-stable-v3.10/topic/iks.tar.gz
Revert "ARM: bL_switcher: Allow detachment of outstanding switch requests"v3.10/topic/iks
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>
-rw-r--r--arch/arm/common/bL_switcher.c32
-rw-r--r--arch/arm/include/asm/bL_switcher.h6
2 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c
index 1883c5b3e3f5..2193ae729bfc 100644
--- a/arch/arm/common/bL_switcher.c
+++ b/arch/arm/common/bL_switcher.c
@@ -404,38 +404,6 @@ int bL_switch_request_cb(unsigned int cpu, unsigned int new_cluster_id,
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 482383b45c91..87ebcbc8e3cb 100644
--- a/arch/arm/include/asm/bL_switcher.h
+++ b/arch/arm/include/asm/bL_switcher.h
@@ -40,9 +40,6 @@ static inline int bL_switch_request(unsigned int cpu, unsigned int new_cluster_i
#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_trace_trigger(void);
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;