[PATCH linux-next] arm: zynq: fix compilation warning

[PATCH linux-next] arm: zynq: fix compilation warning

[Vincent Stehlé]

Fix the following compilation warning:

  arch/arm/mach-zynq/common.c:110:2: warning: initialization from incompatible pointer type [enabled by default]
  arch/arm/mach-zynq/common.c:110:2: warning: (near initialization for ?__mach_desc_XILINX_EP107.restart?) [enabled by default]

Signed-off-by: Vincent Stehl? <vincent.stehle@freescale.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: trivial at kernel.org
---


Hi,

This warning was seen on linux-next tag next-20130627, with config ARM
multi_v7_defconfig.

Best regards,

V.


 arch/arm/mach-zynq/common.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 4130e65..8ea5f11 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -91,7 +91,7 @@ static void __init zynq_map_io(void)
 	zynq_scu_map_io();
 }
 
-static void zynq_system_reset(char mode, const char *cmd)
+static void zynq_system_reset(enum reboot_mode mode, const char *cmd)
 {
 	zynq_slcr_system_reset();
 }
-- 
1.7.10.4

[PATCH linux-next] arm: zynq: fix compilation warning

[Michal Simek]

Hi Vincent,

Arnd asked in this post
http://www.mail-archive.com/linux-kernel at vger.kernel.org/msg454947.html
to fold his small patch to that larger one.

Not sure why it is not there.
Arnd, Robin?

Thanks
Michal


On 06/27/2013 02:42 PM, Vincent Stehl? wrote:
> Fix the following compilation warning:
> 
>   arch/arm/mach-zynq/common.c:110:2: warning: initialization from incompatible pointer type [enabled by default]
>   arch/arm/mach-zynq/common.c:110:2: warning: (near initialization for ?__mach_desc_XILINX_EP107.restart?) [enabled by default]
> 
> Signed-off-by: Vincent Stehl? <vincent.stehle@freescale.com>
> Cc: Robin Holt <holt@sgi.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: trivial at kernel.org
> ---
> 
> 
> Hi,
> 
> This warning was seen on linux-next tag next-20130627, with config ARM
> multi_v7_defconfig.
> 
> Best regards,
> 
> V.
> 
> 
>  arch/arm/mach-zynq/common.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 4130e65..8ea5f11 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -91,7 +91,7 @@ static void __init zynq_map_io(void)
>  	zynq_scu_map_io();
>  }
>  
> -static void zynq_system_reset(char mode, const char *cmd)
> +static void zynq_system_reset(enum reboot_mode mode, const char *cmd)
>  {
>  	zynq_slcr_system_reset();
>  }
> 


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130627/782ecca8/attachment.sig>

[PATCH linux-next] arm: zynq: fix compilation warning

[Stephen Rothwell]

On Thu, 27 Jun 2013 15:01:51 +0200 Michal Simek <monstr@monstr.eu> wrote:
>
> Arnd asked in this post
> http://www.mail-archive.com/linux-kernel at vger.kernel.org/msg454947.html
> to fold his small patch to that larger one.
> 
> Not sure why it is not there.
> Arnd, Robin?

Should have asked Andrew :-)

I have added (most of) Arnd's patch to the end of the akpm tree today.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130628/ceca51ac/attachment.sig>

[PATCH linux-next] arm: zynq: fix compilation warning

[Olof Johansson]

On Thu, Jun 27, 2013 at 5:38 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Thu, 27 Jun 2013 15:01:51 +0200 Michal Simek <monstr@monstr.eu> wrote:
>>
>> Arnd asked in this post
>> http://www.mail-archive.com/linux-kernel at vger.kernel.org/msg454947.html
>> to fold his small patch to that larger one.
>>
>> Not sure why it is not there.
>> Arnd, Robin?
>
> Should have asked Andrew :-)
>
> I have added (most of) Arnd's patch to the end of the akpm tree today.

It was a dependency thing where new code was added in arm-soc, so the
sweeping patches in Andrew's tree couldn't cover them (without adding
said dependency and thus no longer apply on top of mainline).

I'll apply this and the keystone fix to the arm-soc fixes branch now
for 3.11-rc3.


-Olof