From patchwork Fri Aug 5 05:18:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song X-Patchwork-Id: 1037342 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p755KR2F011194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 5 Aug 2011 05:20:48 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpCpP-00082J-IZ; Fri, 05 Aug 2011 05:20:11 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QpCpP-00006I-33; Fri, 05 Aug 2011 05:20:11 +0000 Received: from cluster-g.mailcontrol.com ([208.87.233.190]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpCpM-00005y-Jl for linux-arm-kernel@lists.infradead.org; Fri, 05 Aug 2011 05:20:09 +0000 Received: from rly11g.srv.mailcontrol.com (localhost.localdomain [127.0.0.1]) by rly11g.srv.mailcontrol.com (MailControl) with ESMTP id p755JsQh000888 for ; Fri, 5 Aug 2011 06:19:55 +0100 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by rly11g.srv.mailcontrol.com (MailControl) id p755JHo5031060 for ; Fri, 5 Aug 2011 06:19:17 +0100 Received: from banasiexc01.ASIA.ROOT.PRI ([202.80.51.114]) by rly11g-eth0.srv.mailcontrol.com (envelope-sender ) (MIMEDefang) with ESMTP id p755JAtS030628 (TLS bits=128 verify=FAIL); Fri, 05 Aug 2011 06:19:17 +0100 (BST) Received: from SHAASIEXC01.ASIA.ROOT.PRI (10.125.12.84) by banasiexc01.ASIA.ROOT.PRI (10.190.12.21) with Microsoft SMTP Server (TLS) id 14.1.270.1; Fri, 5 Aug 2011 10:49:09 +0530 Received: from localhost.localdomain (10.125.36.59) by asimail.csr.com (10.125.12.88) with Microsoft SMTP Server (TLS) id 14.1.270.1; Fri, 5 Aug 2011 13:18:59 +0800 From: Barry Song To: Subject: [PATCH] CPUIDLE: fix compiling error for ARM and SH Date: Thu, 4 Aug 2011 22:18:37 -0700 Message-ID: <1312521517-31716-1-git-send-email-bs14@csr.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Originating-IP: [10.125.36.59] X-Scanned-By: MailControl A-12-01-02 (www.mailcontrol.com) on 10.71.1.121 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110805_012008_842897_5F195691 X-CRM114-Status: GOOD ( 15.47 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [208.87.233.190 listed in list.dnswl.org] Cc: Len Brown , Barry Song , linux-arm-kernel@lists.infradead.org, workgroup.linux@csr.com, Barry Song X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 05 Aug 2011 05:20:48 +0000 (UTC) commit a0bfa1373859e9d11dc92561a8667588803e42d8 cause compiling errors for ARM and SH Cc: Len Brown Signed-off-by: Barry Song --- arch/arm/kernel/process.c | 2 +- arch/sh/kernel/idle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index d7ee0d4..1a347f4 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -197,7 +197,7 @@ void cpu_idle(void) cpu_relax(); } else { stop_critical_timings(); - if (cpuidle_call_idle()) + if (cpuidle_idle_call()) pm_idle(); start_critical_timings(); /* diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 3c45de1..32114e0 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c @@ -101,7 +101,7 @@ void cpu_idle(void) local_irq_disable(); /* Don't trace irqs off for idle */ stop_critical_timings(); - if (cpuidle_call_idle()) + if (cpuidle_idle_call()) pm_idle(); /* * Sanity check to ensure that pm_idle() returns