* [PATCH] ARM: kirkwood: add missing kexec.h include
@ 2012-04-06 12:30 Ian Campbell
  2012-04-06 12:50 ` Sergei Shtylyov
  0 siblings, 1 reply; 10+ messages in thread
From: Ian Campbell @ 2012-04-06 12:30 UTC (permalink / raw)
  To: linux-arm-kernel
Fixes build the following error when CONFIG_KEXEC is enabled:
  CC      arch/arm/mach-kirkwood/board-dt.o
arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
kexec.h also needs string.h.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
 arch/arm/mach-kirkwood/board-dt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 1c672d9..5868b71 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -14,6 +14,8 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/string.h>
+#include <asm/kexec.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
-- 
1.7.8.3
^ permalink raw reply related	[flat|nested] 10+ messages in thread
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-06 12:30 [PATCH] ARM: kirkwood: add missing kexec.h include Ian Campbell
@ 2012-04-06 12:50 ` Sergei Shtylyov
  2012-04-06 13:10   ` Ian Campbell
  0 siblings, 1 reply; 10+ messages in thread
From: Sergei Shtylyov @ 2012-04-06 12:50 UTC (permalink / raw)
  To: linux-arm-kernel
On 06.04.2012 16:30, Ian Campbell wrote:
> Fixes build the following error when CONFIG_KEXEC is enabled:
    Maybe "the following build error" instead?
>    CC      arch/arm/mach-kirkwood/board-dt.o
> arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> kexec.h also needs string.h.
    Why it doesn't include it?
> Signed-off-by: Ian Campbell<ijc@hellion.org.uk>
> ---
>   arch/arm/mach-kirkwood/board-dt.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 1c672d9..5868b71 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -14,6 +14,8 @@
>   #include<linux/init.h>
>   #include<linux/of.h>
>   #include<linux/of_platform.h>
> +#include<linux/string.h>
> +#include<asm/kexec.h>
>   #include<asm/mach/arch.h>
>   #include<asm/mach/map.h>
>   #include<mach/bridge-regs.h>
WBR, Sergei
^ permalink raw reply	[flat|nested] 10+ messages in thread
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-06 12:50 ` Sergei Shtylyov
@ 2012-04-06 13:10   ` Ian Campbell
  2012-04-06 17:45     ` Sergei Shtylyov
  2012-04-10 10:00     ` Russell King - ARM Linux
  0 siblings, 2 replies; 10+ messages in thread
From: Ian Campbell @ 2012-04-06 13:10 UTC (permalink / raw)
  To: linux-arm-kernel
On Fri, 2012-04-06 at 16:50 +0400, Sergei Shtylyov wrote:
> On 06.04.2012 16:30, Ian Campbell wrote:
> > Fixes build the following error when CONFIG_KEXEC is enabled:
> 
>     Maybe "the following build error" instead?
Done.
> >    CC      arch/arm/mach-kirkwood/board-dt.o
> > arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> > arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> > arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> 
> > kexec.h also needs string.h.
> 
>     Why it doesn't include it?
Not sure, but actually I should be using linux/kexec.h not asm/kexec.h
anyway which solves the problem too:
8<------------------------------
>From 76ef56286c1ceeceaa4c6c5ba867d9504e175382 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Fri, 6 Apr 2012 13:27:23 +0100
Subject: [PATCH] ARM: kirkwood: add missing kexec.h include
Fixes build the following build error when CONFIG_KEXEC is enabled:
  CC      arch/arm/mach-kirkwood/board-dt.o
arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
[v2, using linux/kexec.h not asm/kexec.h]
---
 arch/arm/mach-kirkwood/board-dt.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 1c672d9..f7fe1b9 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/kexec.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
-- 
1.7.8.3
-- 
Ian Campbell
^ permalink raw reply related	[flat|nested] 10+ messages in thread 
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-06 13:10   ` Ian Campbell
@ 2012-04-06 17:45     ` Sergei Shtylyov
  2012-04-06 18:32       ` Ian Campbell
  2012-04-10 10:00     ` Russell King - ARM Linux
  1 sibling, 1 reply; 10+ messages in thread
From: Sergei Shtylyov @ 2012-04-06 17:45 UTC (permalink / raw)
  To: linux-arm-kernel
On 04/06/2012 05:10 PM, Ian Campbell wrote:
>>> Fixes build the following error when CONFIG_KEXEC is enabled:
>>      Maybe "the following build error" instead?
> Done.
   Not quite. Still "fixes build the following...". :-)
>>>     CC      arch/arm/mach-kirkwood/board-dt.o
>>> arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
>>> arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
>>> arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
>>> kexec.h also needs string.h.
>>      Why it doesn't include it?
> Not sure, but actually I should be using linux/kexec.h not asm/kexec.h
> anyway which solves the problem too:
> 8<------------------------------
>  From 76ef56286c1ceeceaa4c6c5ba867d9504e175382 Mon Sep 17 00:00:00 2001
> From: Ian Campbell<ijc@hellion.org.uk>
> Date: Fri, 6 Apr 2012 13:27:23 +0100
> Subject: [PATCH] ARM: kirkwood: add missing kexec.h include
> Fixes build the following build error when CONFIG_KEXEC is enabled:
    What I meant was "Fixes the following build error when CONFIG_KEXEC is 
enabled:".
>    CC      arch/arm/mach-kirkwood/board-dt.o
> arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> Signed-off-by: Ian Campbell<ijc@hellion.org.uk>
> [v2, using linux/kexec.h not asm/kexec.h]
WBR, Sergei
^ permalink raw reply	[flat|nested] 10+ messages in thread
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-06 17:45     ` Sergei Shtylyov
@ 2012-04-06 18:32       ` Ian Campbell
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Campbell @ 2012-04-06 18:32 UTC (permalink / raw)
  To: linux-arm-kernel
On Fri, 2012-04-06 at 21:45 +0400, Sergei Shtylyov wrote:
> On 04/06/2012 05:10 PM, Ian Campbell wrote:
> 
> >>> Fixes build the following error when CONFIG_KEXEC is enabled:
> 
> >>      Maybe "the following build error" instead?
> 
> > Done.
> 
>    Not quite. Still "fixes build the following...". :-)
Duh, yeah, of course.
Lets try again...
8<--------------------------------------------
>From e8437c14cb0dc23cc8db30a0f596d0cc8dbd28ef Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Fri, 6 Apr 2012 13:27:23 +0100
Subject: [PATCH] ARM: kirkwood: add missing kexec.h include
Fixes the following build error when CONFIG_KEXEC is enabled:
  CC      arch/arm/mach-kirkwood/board-dt.o
arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
[v3, speak actual English in the commit message, thanks Sergei Shtylyov]
[v2, using linux/kexec.h not asm/kexec.h]
---
 arch/arm/mach-kirkwood/board-dt.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index d3cf5e6..23da042 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/kexec.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
-- 
1.7.8.3
-- 
Ian Campbell
Whenever I date a guy, I think, is this the man I want my children
to spend their weekends with?
		-- Rita Rudner
^ permalink raw reply related	[flat|nested] 10+ messages in thread 
 
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-06 13:10   ` Ian Campbell
  2012-04-06 17:45     ` Sergei Shtylyov
@ 2012-04-10 10:00     ` Russell King - ARM Linux
  2012-04-10 10:27       ` Ian Campbell
  1 sibling, 1 reply; 10+ messages in thread
From: Russell King - ARM Linux @ 2012-04-10 10:00 UTC (permalink / raw)
  To: linux-arm-kernel
On Fri, Apr 06, 2012 at 02:10:38PM +0100, Ian Campbell wrote:
> On Fri, 2012-04-06 at 16:50 +0400, Sergei Shtylyov wrote:
> > On 06.04.2012 16:30, Ian Campbell wrote:
> > > Fixes build the following error when CONFIG_KEXEC is enabled:
> > 
> >     Maybe "the following build error" instead?
> 
> Done.
> 
> > >    CC      arch/arm/mach-kirkwood/board-dt.o
> > > arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> > > arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> > > arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> > 
> > > kexec.h also needs string.h.
> > 
> >     Why it doesn't include it?
> 
> Not sure, but actually I should be using linux/kexec.h not asm/kexec.h
> anyway which solves the problem too:
Because you should not be using asm/kexec.h directly but using linux/kexec.h
instead, which will include it via this path:
linux/kexec.h -> linux/compat.h -> linux/sem.h -> linux/rcupdate.h
 -> linux/cpumask.h -> linux/bitmap.h -> linux/string.h
checkpatch has been nobbled not to complain by default about using asm/%.h
includes when linux/%.h includes are also present, which is a backwards
step imho.
^ permalink raw reply	[flat|nested] 10+ messages in thread 
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-10 10:00     ` Russell King - ARM Linux
@ 2012-04-10 10:27       ` Ian Campbell
  0 siblings, 0 replies; 10+ messages in thread
From: Ian Campbell @ 2012-04-10 10:27 UTC (permalink / raw)
  To: linux-arm-kernel
On Tue, 2012-04-10 at 11:00 +0100, Russell King - ARM Linux wrote:
> On Fri, Apr 06, 2012 at 02:10:38PM +0100, Ian Campbell wrote:
> > On Fri, 2012-04-06 at 16:50 +0400, Sergei Shtylyov wrote:
> > > On 06.04.2012 16:30, Ian Campbell wrote:
> > > > Fixes build the following error when CONFIG_KEXEC is enabled:
> > > 
> > >     Maybe "the following build error" instead?
> > 
> > Done.
> > 
> > > >    CC      arch/arm/mach-kirkwood/board-dt.o
> > > > arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> > > > arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> > > > arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> > > 
> > > > kexec.h also needs string.h.
> > > 
> > >     Why it doesn't include it?
> > 
> > Not sure, but actually I should be using linux/kexec.h not asm/kexec.h
> > anyway which solves the problem too:
> 
> Because you should not be using asm/kexec.h directly but using linux/kexec.h
> instead,
Agreed.
>  which will include it via this path:
> 
> linux/kexec.h -> linux/compat.h -> linux/sem.h -> linux/rcupdate.h
>  -> linux/cpumask.h -> linux/bitmap.h -> linux/string.h
> 
> checkpatch has been nobbled not to complain by default about using asm/%.h
> includes when linux/%.h includes are also present, which is a backwards
> step imho.
Yes, I'm not sure what the point of that test would be if it isn't
complaining about that case...
-- 
Ian Campbell
MS-DOS, you can't live with it, you can live without it.
		-- from Lars Wirzenius' .sig
^ permalink raw reply	[flat|nested] 10+ messages in thread 
 
 
 
* [PATCH] ARM: kirkwood: add missing kexec.h include
@ 2012-04-29 13:40 Ian Campbell
  2012-04-30 14:21 ` Arnd Bergmann
  0 siblings, 1 reply; 10+ messages in thread
From: Ian Campbell @ 2012-04-29 13:40 UTC (permalink / raw)
  To: linux-arm-kernel
Fixes the following build error when CONFIG_KEXEC is enabled:
  CC      arch/arm/mach-kirkwood/board-dt.o
arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
[v4, rebase onto recent Linus for repost]
[v3, speak actual English in the commit message, thanks Sergei Shtylyov]
[v2, using linux/kexec.h not asm/kexec.h]
---
 arch/arm/mach-kirkwood/board-dt.c |    1 +
 1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 1c672d9..f7fe1b9 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/kexec.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
-- 
1.7.10
^ permalink raw reply related	[flat|nested] 10+ messages in thread
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-29 13:40 Ian Campbell
@ 2012-04-30 14:21 ` Arnd Bergmann
  2012-05-08 18:20   ` Jason Cooper
  0 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2012-04-30 14:21 UTC (permalink / raw)
  To: linux-arm-kernel
On Sunday 29 April 2012, Ian Campbell wrote:
> 
> Fixes the following build error when CONFIG_KEXEC is enabled:
>   CC      arch/arm/mach-kirkwood/board-dt.o
> arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> 
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> [v4, rebase onto recent Linus for repost]
> [v3, speak actual English in the commit message, thanks Sergei Shtylyov]
> [v2, using linux/kexec.h not asm/kexec.h]
Acked-by: Arnd Bergmann <arnd@arndb.de>
Jason, can you apply this patch on your tree?
	Arnd
^ permalink raw reply	[flat|nested] 10+ messages in thread 
- * [PATCH] ARM: kirkwood: add missing kexec.h include
  2012-04-30 14:21 ` Arnd Bergmann
@ 2012-05-08 18:20   ` Jason Cooper
  0 siblings, 0 replies; 10+ messages in thread
From: Jason Cooper @ 2012-05-08 18:20 UTC (permalink / raw)
  To: linux-arm-kernel
On Mon, Apr 30, 2012 at 02:21:45PM +0000, Arnd Bergmann wrote:
> On Sunday 29 April 2012, Ian Campbell wrote:
> > 
> > Fixes the following build error when CONFIG_KEXEC is enabled:
> >   CC      arch/arm/mach-kirkwood/board-dt.o
> > arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
> > arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
> > arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
> > 
> > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> > [v4, rebase onto recent Linus for repost]
> > [v3, speak actual English in the commit message, thanks Sergei Shtylyov]
> > [v2, using linux/kexec.h not asm/kexec.h]
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> Jason, can you apply this patch on your tree?
Got it, putting together a branch for v3.4 fixes now.
thx,
Jason.
^ permalink raw reply	[flat|nested] 10+ messages in thread 
 
end of thread, other threads:[~2012-05-08 18:20 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-06 12:30 [PATCH] ARM: kirkwood: add missing kexec.h include Ian Campbell
2012-04-06 12:50 ` Sergei Shtylyov
2012-04-06 13:10   ` Ian Campbell
2012-04-06 17:45     ` Sergei Shtylyov
2012-04-06 18:32       ` Ian Campbell
2012-04-10 10:00     ` Russell King - ARM Linux
2012-04-10 10:27       ` Ian Campbell
  -- strict thread matches above, loose matches on Subject: below --
2012-04-29 13:40 Ian Campbell
2012-04-30 14:21 ` Arnd Bergmann
2012-05-08 18:20   ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).