From patchwork Sun Jul 8 21:37:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 1170221 Return-Path: X-Original-To: patchwork-linux-sh@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 B519440134 for ; Sun, 8 Jul 2012 21:45:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752150Ab2GHVcL (ORCPT ); Sun, 8 Jul 2012 17:32:11 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:58472 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066Ab2GHVcK (ORCPT ); Sun, 8 Jul 2012 17:32:10 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 7669E1DA8A8; Sun, 8 Jul 2012 23:31:41 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18236-01; Sun, 8 Jul 2012 23:31:32 +0200 (CEST) Received: from ferrari.rjw.lan (62-121-64-87.home.aster.pl [62.121.64.87]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 3E2461DA95F; Sun, 8 Jul 2012 23:31:32 +0200 (CEST) From: "Rafael J. Wysocki" To: Guennadi Liakhovetski Subject: Re: ARM: mach-shmobile: recent next build failure Date: Sun, 8 Jul 2012 23:37:44 +0200 User-Agent: KMail/1.13.6 (Linux/3.5.0-rc5+; KDE/4.6.0; x86_64; ; ) Cc: Magnus Damm , linux-sh@vger.kernel.org, Kuninori Morimoto References: <201207081701.46971.rjw@sisk.pl> <201207082317.11890.rjw@sisk.pl> In-Reply-To: <201207082317.11890.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201207082337.44848.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org On Sunday, July 08, 2012, Rafael J. Wysocki wrote: > On Sunday, July 08, 2012, Rafael J. Wysocki wrote: > > On Sunday, July 08, 2012, Guennadi Liakhovetski wrote: > > > Hi > > > > > > Got this build failure with Friday's next: > > > > > > linux/arch/arm/mach-shmobile/pm-sh7372.c: In function 'sh7372_pm_init': > > > linux/arch/arm/mach-shmobile/pm-sh7372.c:598: error: implicit declaration of function 'sh7372_suspend_init' > > > linux/arch/arm/mach-shmobile/pm-sh7372.c:599: error: implicit declaration of function 'sh7372_cpuidle_init' > > > make[2]: *** [arch/arm/mach-shmobile/pm-sh7372.o] Error 1 > > > > > > .config available on request. > > > > Please attach. > > > > Magnus, that appears to be a result of your recent wakeup changes. > > Guennadi, does the appended patch fix the problem for you? Well, scratch that, it's not so simple. The patch below should help instead. Thanks, Rafael --- From: Rafael J. Wysocki Subject: ARM: shmobile: Fix sh7372 build problem related to PM settings The cpuidle code in pm-sh7372.c and sleep-sh7372.S has to depend on CONFIG_SUSPEND as well as on CONFIG_CPU_IDLE, because cpu_suspend() and cpu_resume() are not available if CONFIG_SUSPEND is unset. Signed-off-by: Rafael J. Wysocki --- arch/arm/mach-shmobile/pm-sh7372.c | 10 +++++----- arch/arm/mach-shmobile/sleep-sh7372.S | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/arch/arm/mach-shmobile/pm-sh7372.c =================================================================== --- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c +++ linux/arch/arm/mach-shmobile/pm-sh7372.c @@ -151,7 +151,7 @@ struct rmobile_pm_domain sh7372_pd_a3sg #endif /* CONFIG_PM */ -#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE) +#ifdef CONFIG_SUSPEND static void sh7372_set_reset_vector(unsigned long address) { /* set reset vector, translate 4k */ @@ -303,8 +303,9 @@ static void sh7372_enter_a3sm_common(int sh7372_set_reset_vector(__pa(sh7372_resume_core_standby_sysc)); sh7372_enter_sysc(pllc0_on, 1 << 12); } +#endif /* CONFIG_SUSPEND */ -#ifdef CONFIG_CPU_IDLE +#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_SUSPEND) static int sh7372_do_idle_core_standby(unsigned long unused) { cpu_do_idle(); /* WFI when SYSTBCR == 0x10 -> Core Standby */ @@ -371,7 +372,7 @@ static void sh7372_cpuidle_init(void) } #else static void sh7372_cpuidle_init(void) {} -#endif +#endif /* CONFIG_CPU_IDLE && CONFIG_SUSPEND */ #ifdef CONFIG_SUSPEND static void sh7372_enter_a4s_common(int pllc0_on) @@ -441,8 +442,7 @@ static void sh7372_suspend_init(void) } #else static void sh7372_suspend_init(void) {} -#endif -#endif /* CONFIG_SUSPEND || CONFIG_CPU_IDLE */ +#endif /* CONFIG_SUSPEND */ void __init sh7372_pm_init(void) { Index: linux/arch/arm/mach-shmobile/sleep-sh7372.S =================================================================== --- linux.orig/arch/arm/mach-shmobile/sleep-sh7372.S +++ linux/arch/arm/mach-shmobile/sleep-sh7372.S @@ -34,7 +34,7 @@ #include #include -#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE) +#ifdef CONFIG_SUSPEND .align 12 .text .global sh7372_resume_core_standby_sysc