From patchwork Sat Aug 13 23:55:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 1063712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7DNrRrD017140 for ; Sat, 13 Aug 2011 23:53:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752623Ab1HMXx0 (ORCPT ); Sat, 13 Aug 2011 19:53:26 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:39461 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333Ab1HMXx0 (ORCPT ); Sat, 13 Aug 2011 19:53:26 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 9D1BA1B8778; Sun, 14 Aug 2011 01:15:47 +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 15132-08; Sun, 14 Aug 2011 01:15:37 +0200 (CEST) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id B74491B8732; Sun, 14 Aug 2011 01:15:37 +0200 (CEST) From: "Rafael J. Wysocki" To: Peter Huewe Subject: Re: [PATCH] shmobile/sh7372: Add missing CONFIG_PM guards to fix build failure Date: Sun, 14 Aug 2011 01:55:05 +0200 User-Agent: KMail/1.13.6 (Linux/3.1.0-rc1+; KDE/4.6.0; x86_64; ; ) Cc: Paul Mundt , Magnus Damm , Russell King , linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <1313274841-8322-1-git-send-email-peterhuewe@gmx.de> In-Reply-To: <1313274841-8322-1-git-send-email-peterhuewe@gmx.de> MIME-Version: 1.0 Message-Id: <201108140155.05625.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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 13 Aug 2011 23:53:27 +0000 (UTC) On Sunday, August 14, 2011, Peter Huewe wrote: > This patch fixes a build failure with the ap4evb_defconfig by adding the > missing #ifdef CONFIG_PM. This is not the right fix. Besides, you seem to be testing linux-next and the build problem is in the linux-pm tree. Please check if the appended patch fixes the problem for you. Rafael Reviewed-by: Peter Huewe --- arch/arm/mach-shmobile/include/mach/sh7372.h | 3 +++ arch/arm/mach-shmobile/pm-sh7372.c | 6 ++++++ arch/arm/mach-shmobile/setup-sh7372.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) -- 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/include/mach/sh7372.h =================================================================== --- linux.orig/arch/arm/mach-shmobile/include/mach/sh7372.h +++ linux/arch/arm/mach-shmobile/include/mach/sh7372.h @@ -494,9 +494,12 @@ extern struct sh7372_pm_domain sh7372_a3 extern void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd); extern void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd, struct platform_device *pdev); +extern void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd, + struct sh7372_pm_domain *sh7372_sd); #else #define sh7372_init_pm_domain(pd) do { } while(0) #define sh7372_add_device_to_domain(pd, pdev) do { } while(0) +#define sh7372_pm_add_subdomain(pd, sd) do { } while(0) #endif /* CONFIG_PM */ #endif /* __ASM_SH7372_H__ */ Index: linux/arch/arm/mach-shmobile/setup-sh7372.c =================================================================== --- linux.orig/arch/arm/mach-shmobile/setup-sh7372.c +++ linux/arch/arm/mach-shmobile/setup-sh7372.c @@ -849,7 +849,7 @@ void __init sh7372_add_standard_devices( sh7372_init_pm_domain(&sh7372_a3ri); sh7372_init_pm_domain(&sh7372_a3sg); - pm_genpd_add_subdomain(&sh7372_a4lc.genpd, &sh7372_a3rv.genpd); + sh7372_pm_add_subdomain(&sh7372_a4lc, &sh7372_a3rv); platform_add_devices(sh7372_early_devices, ARRAY_SIZE(sh7372_early_devices)); 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 @@ -119,6 +119,12 @@ void sh7372_add_device_to_domain(struct pm_clk_add(dev, NULL); } +void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd, + struct sh7372_pm_domain *sh7372_sd) +{ + pm_genpd_add_subdomain(&sh7372_pd->genpd, &sh7372_sd->genpd); +} + struct sh7372_pm_domain sh7372_a4lc = { .bit_shift = 1, };