| Message ID | 1372336962-6459-1-git-send-email-vincent.stehle@freescale.com |
|---|---|
| State | New |
| Headers | show |
Hi Vincent, Arnd asked in this post http://www.mail-archive.com/linux-kernel@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@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(); > } >
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@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.
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@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
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(); }
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@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(-)