[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-y2nbw5j3ma5siy5584919z5i@git.kernel.org>
Date: Tue, 11 Feb 2014 04:17:56 -0800
From: tip-bot for Nicolas Pitre <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
peterz@...radead.org, nicolas.pitre@...aro.org,
lethal@...ux-sh.org, benh@...nel.crashing.org,
linux@....linux.org.uk, preeti@...ux.vnet.ibm.com, nico@...aro.org,
rjw@...ysocki.net, tglx@...utronix.de, daniel.lezcano@...aro.org
Subject: [tip:sched/core] sched/idle, ARM:
Remove redundant cpuidle_idle_call()
Commit-ID: ad68cc7a777948b77f15a3dc3510918ff87ed0c0
Gitweb: http://git.kernel.org/tip/ad68cc7a777948b77f15a3dc3510918ff87ed0c0
Author: Nicolas Pitre <nicolas.pitre@...aro.org>
AuthorDate: Wed, 29 Jan 2014 12:45:09 -0500
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 11 Feb 2014 09:58:22 +0100
sched/idle, ARM: Remove redundant cpuidle_idle_call()
The core idle loop now takes care of it.
Signed-off-by: Nicolas Pitre <nico@...aro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Preeti U Murthy <preeti@...ux.vnet.ibm.com>
Cc: Paul Mundt <lethal@...ux-sh.org>
Cc: "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: linux-arm-kernel@...ts.infradead.org
Cc: linuxppc-dev@...ts.ozlabs.org
Cc: linux-sh@...r.kernel.org
Cc: linux-pm@...r.kernel.org
Cc: Russell King <linux@....linux.org.uk>
Cc: linaro-kernel@...ts.linaro.org
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/n/tip-y2nbw5j3ma5siy5584919z5i@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/arm/kernel/process.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 92f7b15..adabeab 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -30,7 +30,6 @@
#include <linux/uaccess.h>
#include <linux/random.h>
#include <linux/hw_breakpoint.h>
-#include <linux/cpuidle.h>
#include <linux/leds.h>
#include <linux/reboot.h>
@@ -133,7 +132,11 @@ EXPORT_SYMBOL_GPL(arm_pm_restart);
void (*arm_pm_idle)(void);
-static void default_idle(void)
+/*
+ * Called from the core idle loop.
+ */
+
+void arch_cpu_idle(void)
{
if (arm_pm_idle)
arm_pm_idle();
@@ -168,15 +171,6 @@ void arch_cpu_idle_dead(void)
#endif
/*
- * Called from the core idle loop.
- */
-void arch_cpu_idle(void)
-{
- if (cpuidle_idle_call())
- default_idle();
-}
-
-/*
* Called by kexec, immediately prior to machine_kexec().
*
* This must completely disable all secondary CPUs; simply causing those CPUs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists