[2.6.30-rc1] Append a comma to INIT_FTRACE_GRAPH.

[2.6.30-rc1] Append a comma to INIT_FTRACE_GRAPH.

[Tetsuo Handa]

Due to lack of a comma, build fails if elements are appended to
INIT_TASK() macro.

arch/x86/kernel/init_task.c:33: error: request for member `XXXXXXXXXX' in something not a structure or union
arch/x86/kernel/init_task.c:33: error: initializer element is not constant
arch/x86/kernel/init_task.c:33: error: (near initialization for `init_task.ret_stack')
make[1]: *** [arch/x86/kernel/init_task.o] Error 1
make: *** [arch/x86/kernel] Error 2

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---
 include/linux/ftrace.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.30-rc1.orig/include/linux/ftrace.h
+++ linux-2.6.30-rc1/include/linux/ftrace.h
@@ -357,7 +357,7 @@ struct ftrace_graph_ret {
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
 /* for init task */
-#define INIT_FTRACE_GRAPH		.ret_stack = NULL
+#define INIT_FTRACE_GRAPH		.ret_stack = NULL,
 
 /*
  * Stack of return addresses for functions

Re: [2.6.30-rc1] Append a comma to INIT_FTRACE_GRAPH.

[Ingo Molnar]

* Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> wrote:

> Due to lack of a comma, build fails if elements are appended to
> INIT_TASK() macro.
> 
> arch/x86/kernel/init_task.c:33: error: request for member `XXXXXXXXXX' in something not a structure or union
> arch/x86/kernel/init_task.c:33: error: initializer element is not constant
> arch/x86/kernel/init_task.c:33: error: (near initialization for `init_task.ret_stack')
> make[1]: *** [arch/x86/kernel/init_task.o] Error 1
> make: *** [arch/x86/kernel] Error 2
> 
> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> ---
>  include/linux/ftrace.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to tip:tracing/urgent, thanks. (It is not a problem right 
now because this is the last in the line, but it will become a 
problem the moment something is appended.)

	Ingo

[tip:tracing/urgent] tracing: append a comma to INIT_FTRACE_GRAPH

[Tetsuo Handa]

Commit-ID:  f876d346e3807647b1de411de6a86c44821896ca
Gitweb:     http://git.kernel.org/tip/f876d346e3807647b1de411de6a86c44821896ca
Author:     Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
AuthorDate: Wed, 8 Apr 2009 14:05:43 +0900
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 8 Apr 2009 10:25:25 +0200

tracing: append a comma to INIT_FTRACE_GRAPH

Impact: dont break future extensions of INIT_TASK

While not a problem right now, due to lack of a comma, build fails if
elements are appended to INIT_TASK() macro in development code:

 arch/x86/kernel/init_task.c:33: error: request for member `XXXXXXXXXX' in something not a structure or union
 arch/x86/kernel/init_task.c:33: error: initializer element is not constant
 arch/x86/kernel/init_task.c:33: error: (near initialization for `init_task.ret_stack')
 make[1]: *** [arch/x86/kernel/init_task.o] Error 1
 make: *** [arch/x86/kernel] Error 2

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: srostedt@redhat.com
LKML-Reference: <200904080505.n3855hcn017109@www262.sakura.ne.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 include/linux/ftrace.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index da5405d..ff112a8 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -357,7 +357,7 @@ struct ftrace_graph_ret {
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
 /* for init task */
-#define INIT_FTRACE_GRAPH		.ret_stack = NULL
+#define INIT_FTRACE_GRAPH		.ret_stack = NULL,
 
 /*
  * Stack of return addresses for functions