From patchwork Sun Feb 10 05:58:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 2121401 X-Patchwork-Delegate: lenb@kernel.org Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 457363FDFB for ; Sun, 10 Feb 2013 05:58:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550Ab3BJF6q (ORCPT ); Sun, 10 Feb 2013 00:58:46 -0500 Received: from mail-vc0-f180.google.com ([209.85.220.180]:34182 "EHLO mail-vc0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752299Ab3BJF6k (ORCPT ); Sun, 10 Feb 2013 00:58:40 -0500 Received: by mail-vc0-f180.google.com with SMTP id fo13so3118988vcb.25 for ; Sat, 09 Feb 2013 21:58:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=VvZqsfekRd8LcutJgHvpnWmFxnzOZmE2U6U9W/+rAX8=; b=fdL8XfA807507f9a1VeZHhNzUthewNBXfbI1Dp37w8HEjegbdvtwe0oAlPQIY71vsI F5ZxY08xXlc7bv97ztym5srLy4Kozlc4h32/cvxewyKBQN6CMraPSdHTa9zSSJDRkNCw CyA958S6xcgFygCkEkwKmZEmvpLLR8vjzgr/qbNRg40xiSmM3yovw7pVi446UFyrdhdp T3QWowSIMZOIEOws5jU/kiI9XM9o1cicnnnikL35jV2opZeyLNH12D+mU7PlI9YZ5MTl k1wbg/Chgh7ymJIl8dkA6kkDeSGawZFFfX9Gb1rxV6QPMW7hNbIZhgi72bvaOd8KCRBi +lSQ== X-Received: by 10.52.240.146 with SMTP id wa18mr11890766vdc.47.1360475919732; Sat, 09 Feb 2013 21:58:39 -0800 (PST) Received: from x980.localdomain6 (pool-108-7-58-246.bstnma.fios.verizon.net. [108.7.58.246]) by mx.google.com with ESMTPS id p7sm42173052vdt.2.2013.02.09.21.58.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 21:58:39 -0800 (PST) From: Len Brown To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown , linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/16] ARM64 idle: delete pm_idle Date: Sun, 10 Feb 2013 00:58:14 -0500 Message-Id: X-Mailer: git-send-email 1.8.1.3.535.ga923c31 In-Reply-To: <1360475903-30007-1-git-send-email-lenb@kernel.org> References: <1360475903-30007-1-git-send-email-lenb@kernel.org> In-Reply-To: <2b219d07e0f287c2c713f5465fc8646158fa986e.1360475150.git.len.brown@intel.com> References: <2b219d07e0f287c2c713f5465fc8646158fa986e.1360475150.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Len Brown pm_idle() on arm64 was a synonym for default_idle(), so remove it and invoke default_idle() directly. Signed-off-by: Len Brown Cc: linux-arm-kernel@lists.infradead.org Acked-by: Catalin Marinas --- arch/arm64/kernel/process.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index cb0956b..c7002d4 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -97,14 +97,9 @@ static void default_idle(void) local_irq_enable(); } -void (*pm_idle)(void) = default_idle; -EXPORT_SYMBOL_GPL(pm_idle); - /* - * The idle thread, has rather strange semantics for calling pm_idle, - * but this is what x86 does and we need to do the same, so that - * things like cpuidle get called in the same way. The only difference - * is that we always respect 'hlt_counter' to prevent low power idle. + * The idle thread. + * We always respect 'hlt_counter' to prevent low power idle. */ void cpu_idle(void) { @@ -122,10 +117,10 @@ void cpu_idle(void) local_irq_disable(); if (!need_resched()) { stop_critical_timings(); - pm_idle(); + default_idle(); start_critical_timings(); /* - * pm_idle functions should always return + * default_idle functions should always return * with IRQs enabled. */ WARN_ON(irqs_disabled());