From mboxrd@z Thu Jan  1 00:00:00 1970
From: Shawn Guo <shawn.guo@linaro.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree
Date: Sat, 7 Jan 2012 12:44:42 +0800
Message-ID: <20120107044439.GE4790@S2101-09.ap.freescale.net>
References: <20120106120345.8157a839b1c924315d728eea@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-iy0-f174.google.com ([209.85.210.174]:59428 "EHLO
	mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751934Ab2AGEeV (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Fri, 6 Jan 2012 23:34:21 -0500
Content-Disposition: inline
In-Reply-To: <20120106120345.8157a839b1c924315d728eea@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hui Wang <jason77.wang@gmail.com>, Russell King <rmk@arm.linux.org.uk>, Nicolas Pitre <nicolas.pitre@linaro.org>

Hi Stephen,

On Fri, Jan 06, 2012 at 12:03:45PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm/mach-imx/mm-imx5.c
> index 65139a6,bc17dfe..0000000
> --- a/arch/arm/mach-imx/mm-imx5.c
> +++ b/arch/arm/mach-imx/mm-imx5.c
> @@@ -21,9 -22,27 +22,24 @@@
>   #include <mach/devices-common.h>
>   #include <mach/iomux-v3.h>
>  =20
> + static struct clk *gpc_dvfs_clk;
> +=20
>   static void imx5_idle(void)
>   {
>  -	if (!need_resched()) {
>  -		/* gpc clock is needed for SRPG */
>  -		if (gpc_dvfs_clk =3D=3D NULL) {
>  -			gpc_dvfs_clk =3D clk_get(NULL, "gpc_dvfs");
>  -			if (IS_ERR(gpc_dvfs_clk))
>  -				goto err0;
>  -		}
>  -		clk_enable(gpc_dvfs_clk);
>  -		mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
>  -		if (tzic_enable_wake())
>  -			goto err1;
>  -		cpu_do_idle();
>  -err1:
>  -		clk_disable(gpc_dvfs_clk);
> ++	/* gpc clock is needed for SRPG */
> ++	if (gpc_dvfs_clk =3D=3D NULL) {
> ++		gpc_dvfs_clk =3D clk_get(NULL, "gpc_dvfs");
> ++		if (IS_ERR(gpc_dvfs_clk))
> ++			goto err0;
> + 	}
> ++	clk_enable(gpc_dvfs_clk);
>  +	mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
> ++	if (tzic_enable_wake())
> ++		goto err1;
> ++	cpu_do_idle();
> ++err1:
> ++	clk_disable(gpc_dvfs_clk);
> + err0:
>  -	local_irq_enable();

This results in a compile error.

  CC      arch/arm/mach-imx/mm-imx5.o
arch/arm/mach-imx/mm-imx5.c: In function =E2=80=98imx5_idle=E2=80=99:
arch/arm/mach-imx/mm-imx5.c:42:1: error: label at end of compound state=
ment

Regards,
Shawn

>   }
>  =20
>   /*