Patchwork ARM: imx: compile fix for hotplug.c

login
register
mail settings
Submitter Shawn Guo
Date May 2, 2013, 5:58 a.m.
Message ID <1367474331-3479-1-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/240896/
State New
Headers show

Comments

Shawn Guo - May 2, 2013, 5:58 a.m.
Commit bca7a5a (ARM: cpu hotplug: remove majority of cache flushing
from platforms) removes include of <asm/cacheflush.h> and hence
discovers a few indirect inclusion and declaration problems as below.

  CC      arch/arm/mach-imx/hotplug.o
In file included from arch/arm/mach-imx/hotplug.c:16:0:
arch/arm/mach-imx/common.h:100:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
arch/arm/mach-imx/common.h:100:29: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
arch/arm/mach-imx/common.h:101:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_die’:
arch/arm/mach-imx/hotplug.c:53:2: error: implicit declaration of function ‘cpu_do_idle’ [-Werror=implicit-function-declaration]
arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_kill’:
arch/arm/mach-imx/hotplug.c:58:26: error: ‘jiffies’ undeclared (first use in this function)
arch/arm/mach-imx/hotplug.c:58:26: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/mach-imx/hotplug.c:58:2: error: implicit declaration of function ‘msecs_to_jiffies’ [-Werror=implicit-function-declaration]
arch/arm/mach-imx/hotplug.c:61:3: error: implicit declaration of function ‘time_after’ [-Werror=implicit-function-declaration]

Fix them by adding the needed inclusion and declaration.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-imx/common.h  |    1 +
 arch/arm/mach-imx/hotplug.c |    2 ++
 2 files changed, 3 insertions(+)
Arnd Bergmann - May 2, 2013, 3:27 p.m.
On Thursday 02 May 2013, Shawn Guo wrote:
> Commit bca7a5a (ARM: cpu hotplug: remove majority of cache flushing
> from platforms) removes include of <asm/cacheflush.h> and hence
> discovers a few indirect inclusion and declaration problems as below.
> 
>   CC      arch/arm/mach-imx/hotplug.o
> In file included from arch/arm/mach-imx/hotplug.c:16:0:
> arch/arm/mach-imx/common.h:100:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
> arch/arm/mach-imx/common.h:100:29: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
> arch/arm/mach-imx/common.h:101:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
> arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_die’:
> arch/arm/mach-imx/hotplug.c:53:2: error: implicit declaration of function ‘cpu_do_idle’ [-Werror=implicit-function-declaration]
> arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_kill’:
> arch/arm/mach-imx/hotplug.c:58:26: error: ‘jiffies’ undeclared (first use in this function)
> arch/arm/mach-imx/hotplug.c:58:26: note: each undeclared identifier is reported only once for each function it appears in
> arch/arm/mach-imx/hotplug.c:58:2: error: implicit declaration of function ‘msecs_to_jiffies’ [-Werror=implicit-function-declaration]
> arch/arm/mach-imx/hotplug.c:61:3: error: implicit declaration of function ‘time_after’ [-Werror=implicit-function-declaration]
> 
> Fix them by adding the needed inclusion and declaration.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

Acked-by: Arnd Bergmann <arnd@arndb.de>

I found the same thing today, and there seems to be a similar problem for highbank.

	Arnd
Uwe Kleine-König - May 8, 2013, 7:48 a.m.
Hello Shawn,

On Thu, May 02, 2013 at 01:58:51PM +0800, Shawn Guo wrote:
> Commit bca7a5a (ARM: cpu hotplug: remove majority of cache flushing
> from platforms) removes include of <asm/cacheflush.h> and hence
> discovers a few indirect inclusion and declaration problems as below.
> 
>   CC      arch/arm/mach-imx/hotplug.o
> In file included from arch/arm/mach-imx/hotplug.c:16:0:
> arch/arm/mach-imx/common.h:100:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
> arch/arm/mach-imx/common.h:100:29: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
> arch/arm/mach-imx/common.h:101:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
> arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_die’:
> arch/arm/mach-imx/hotplug.c:53:2: error: implicit declaration of function ‘cpu_do_idle’ [-Werror=implicit-function-declaration]
> arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_kill’:
> arch/arm/mach-imx/hotplug.c:58:26: error: ‘jiffies’ undeclared (first use in this function)
> arch/arm/mach-imx/hotplug.c:58:26: note: each undeclared identifier is reported only once for each function it appears in
> arch/arm/mach-imx/hotplug.c:58:2: error: implicit declaration of function ‘msecs_to_jiffies’ [-Werror=implicit-function-declaration]
> arch/arm/mach-imx/hotplug.c:61:3: error: implicit declaration of function ‘time_after’ [-Werror=implicit-function-declaration]
> 
> Fix them by adding the needed inclusion and declaration.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
I just sent an equivalent patch for that issue (so:
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
).

Is this patch already queued somewhere?

Uwe
Shawn Guo - May 8, 2013, 1:25 p.m.
Hi Uwe,

On Wed, May 08, 2013 at 09:48:10AM +0200, Uwe Kleine-König wrote:
> I just sent an equivalent patch for that issue (so:
> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Thanks.

> ).
> 
> Is this patch already queued somewhere?
> 
I just resend it to Arnd for 3.10-rc1 inclusion.

Shawn

Patch

diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 4cba7db..c08ae3f 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -12,6 +12,7 @@ 
 #define __ASM_ARCH_MXC_COMMON_H__
 
 struct platform_device;
+struct pt_regs;
 struct clk;
 enum mxc_cpu_pwr_mode;
 
diff --git a/arch/arm/mach-imx/hotplug.c b/arch/arm/mach-imx/hotplug.c
index 5e91112..3daf1ed 100644
--- a/arch/arm/mach-imx/hotplug.c
+++ b/arch/arm/mach-imx/hotplug.c
@@ -11,7 +11,9 @@ 
  */
 
 #include <linux/errno.h>
+#include <linux/jiffies.h>
 #include <asm/cp15.h>
+#include <asm/proc-fns.h>
 
 #include "common.h"