From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbaBKMTk (ORCPT ); Tue, 11 Feb 2014 07:19:40 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46618 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbaBKMTi (ORCPT ); Tue, 11 Feb 2014 07:19:38 -0500 Date: Tue, 11 Feb 2014 04:17:56 -0800 From: tip-bot for Nicolas Pitre Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, nicolas.pitre@linaro.org, lethal@linux-sh.org, benh@kernel.crashing.org, linux@arm.linux.org.uk, preeti@linux.vnet.ibm.com, nico@linaro.org, rjw@rjwysocki.net, tglx@linutronix.de, daniel.lezcano@linaro.org Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, nicolas.pitre@linaro.org, lethal@linux-sh.org, benh@kernel.crashing.org, preeti@linux.vnet.ibm.com, linux@arm.linux.org.uk, nico@linaro.org, tglx@linutronix.de, rjw@rjwysocki.net, daniel.lezcano@linaro.org To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/idle, ARM: Remove redundant cpuidle_idle_call() Git-Commit-ID: ad68cc7a777948b77f15a3dc3510918ff87ed0c0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.1 (terminus.zytor.com [127.0.0.1]); Tue, 11 Feb 2014 04:18:02 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ad68cc7a777948b77f15a3dc3510918ff87ed0c0 Gitweb: http://git.kernel.org/tip/ad68cc7a777948b77f15a3dc3510918ff87ed0c0 Author: Nicolas Pitre AuthorDate: Wed, 29 Jan 2014 12:45:09 -0500 Committer: Ingo Molnar 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 Acked-by: Daniel Lezcano Cc: Preeti U Murthy Cc: Paul Mundt Cc: "Rafael J. Wysocki" Cc: linux-arm-kernel@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: Russell King Cc: linaro-kernel@lists.linaro.org Cc: Benjamin Herrenschmidt Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-y2nbw5j3ma5siy5584919z5i@git.kernel.org Signed-off-by: Ingo Molnar --- 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 #include #include -#include #include #include @@ -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