* [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used
@ 2009-11-05 3:16 Lai Jiangshan
2009-11-05 6:39 ` Frederic Weisbecker
2009-11-18 11:13 ` [tip:tracing/core] tracing: Prevent " tip-bot for Lai Jiangshan
0 siblings, 2 replies; 6+ messages in thread
From: Lai Jiangshan @ 2009-11-05 3:16 UTC (permalink / raw)
To: Frederic Weisbecker; +Cc: Steven Rostedt, Ingo Molnar, LKML
prevent build warning when !CONFIG_FUNCTION_GRAPH_TRACER
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7cb6f19..892e3ea 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2274,7 +2274,6 @@ void ftrace_set_notrace(unsigned char *buf, int len, int reset)
#define FTRACE_FILTER_SIZE COMMAND_LINE_SIZE
static char ftrace_notrace_buf[FTRACE_FILTER_SIZE] __initdata;
static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata;
-static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
static int __init set_ftrace_notrace(char *str)
{
@@ -2291,6 +2290,7 @@ static int __init set_ftrace_filter(char *str)
__setup("ftrace_filter=", set_ftrace_filter);
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
static int __init set_graph_function(char *str)
{
strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used
2009-11-05 3:16 [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used Lai Jiangshan
@ 2009-11-05 6:39 ` Frederic Weisbecker
2009-11-17 7:46 ` Lai Jiangshan
2009-11-18 11:13 ` [tip:tracing/core] tracing: Prevent " tip-bot for Lai Jiangshan
1 sibling, 1 reply; 6+ messages in thread
From: Frederic Weisbecker @ 2009-11-05 6:39 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Steven Rostedt, Ingo Molnar, LKML
On Thu, Nov 05, 2009 at 11:16:17AM +0800, Lai Jiangshan wrote:
>
> prevent build warning when !CONFIG_FUNCTION_GRAPH_TRACER
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
> ---
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 7cb6f19..892e3ea 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -2274,7 +2274,6 @@ void ftrace_set_notrace(unsigned char *buf, int len, int reset)
> #define FTRACE_FILTER_SIZE COMMAND_LINE_SIZE
> static char ftrace_notrace_buf[FTRACE_FILTER_SIZE] __initdata;
> static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata;
> -static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
>
> static int __init set_ftrace_notrace(char *str)
> {
> @@ -2291,6 +2290,7 @@ static int __init set_ftrace_filter(char *str)
> __setup("ftrace_filter=", set_ftrace_filter);
>
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> +static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
> static int __init set_graph_function(char *str)
> {
> strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used
2009-11-05 6:39 ` Frederic Weisbecker
@ 2009-11-17 7:46 ` Lai Jiangshan
2009-11-17 13:37 ` Steven Rostedt
2009-11-17 15:07 ` Steven Rostedt
0 siblings, 2 replies; 6+ messages in thread
From: Lai Jiangshan @ 2009-11-17 7:46 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Frederic Weisbecker, Steven Rostedt, LKML
Frederic Weisbecker wrote:
> On Thu, Nov 05, 2009 at 11:16:17AM +0800, Lai Jiangshan wrote:
>> prevent build warning when !CONFIG_FUNCTION_GRAPH_TRACER
>>
>> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>
>
> Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Hi, Ingo,
Could you apply this cleanup patch for -tip?
Lai
>
>
>
>> ---
>> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
>> index 7cb6f19..892e3ea 100644
>> --- a/kernel/trace/ftrace.c
>> +++ b/kernel/trace/ftrace.c
>> @@ -2274,7 +2274,6 @@ void ftrace_set_notrace(unsigned char *buf, int len, int reset)
>> #define FTRACE_FILTER_SIZE COMMAND_LINE_SIZE
>> static char ftrace_notrace_buf[FTRACE_FILTER_SIZE] __initdata;
>> static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata;
>> -static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
>>
>> static int __init set_ftrace_notrace(char *str)
>> {
>> @@ -2291,6 +2290,7 @@ static int __init set_ftrace_filter(char *str)
>> __setup("ftrace_filter=", set_ftrace_filter);
>>
>> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
>> +static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
>> static int __init set_graph_function(char *str)
>> {
>> strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);
>>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used
2009-11-17 7:46 ` Lai Jiangshan
@ 2009-11-17 13:37 ` Steven Rostedt
2009-11-17 15:07 ` Steven Rostedt
1 sibling, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2009-11-17 13:37 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Ingo Molnar, Frederic Weisbecker, LKML
On Tue, 2009-11-17 at 15:46 +0800, Lai Jiangshan wrote:
> Frederic Weisbecker wrote:
> > On Thu, Nov 05, 2009 at 11:16:17AM +0800, Lai Jiangshan wrote:
> >> prevent build warning when !CONFIG_FUNCTION_GRAPH_TRACER
> >>
> >> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> >
> >
> > Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
>
> Hi, Ingo,
>
> Could you apply this cleanup patch for -tip?
I'll pull it in. I'm going to try one more patch set for 32.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used
2009-11-17 7:46 ` Lai Jiangshan
2009-11-17 13:37 ` Steven Rostedt
@ 2009-11-17 15:07 ` Steven Rostedt
1 sibling, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2009-11-17 15:07 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Ingo Molnar, Frederic Weisbecker, LKML
On Tue, 2009-11-17 at 15:46 +0800, Lai Jiangshan wrote:
> Frederic Weisbecker wrote:
> > On Thu, Nov 05, 2009 at 11:16:17AM +0800, Lai Jiangshan wrote:
> >> prevent build warning when !CONFIG_FUNCTION_GRAPH_TRACER
> >>
> >> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> >
> >
> > Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
>
> Hi, Ingo,
>
> Could you apply this cleanup patch for -tip?
>
Ah this is only in tip. OK, I'll add it to my queue anyway.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:tracing/core] tracing: Prevent build warning: 'ftrace_graph_buf' defined but not used
2009-11-05 3:16 [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used Lai Jiangshan
2009-11-05 6:39 ` Frederic Weisbecker
@ 2009-11-18 11:13 ` tip-bot for Lai Jiangshan
1 sibling, 0 replies; 6+ messages in thread
From: tip-bot for Lai Jiangshan @ 2009-11-18 11:13 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, rostedt, tglx, laijs
Commit-ID: f6060f46819f313d34a8c8151390cda509c23389
Gitweb: http://git.kernel.org/tip/f6060f46819f313d34a8c8151390cda509c23389
Author: Lai Jiangshan <laijs@cn.fujitsu.com>
AuthorDate: Thu, 5 Nov 2009 11:16:17 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Tue, 17 Nov 2009 11:05:49 -0500
tracing: Prevent build warning: 'ftrace_graph_buf' defined but not used
Prevent build warning when CONFIG_FUNCTION_GRAPH_TRACER is not set.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <4AF24381.5060307@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 1ed514f..7f9b51e 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2274,7 +2274,6 @@ void ftrace_set_notrace(unsigned char *buf, int len, int reset)
#define FTRACE_FILTER_SIZE COMMAND_LINE_SIZE
static char ftrace_notrace_buf[FTRACE_FILTER_SIZE] __initdata;
static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata;
-static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
static int __init set_ftrace_notrace(char *str)
{
@@ -2291,6 +2290,7 @@ static int __init set_ftrace_filter(char *str)
__setup("ftrace_filter=", set_ftrace_filter);
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;
static int __init set_graph_function(char *str)
{
strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-11-18 11:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-05 3:16 [PATCH] tracing: prevent build warning: 'ftrace_graph_buf' defined but not used Lai Jiangshan
2009-11-05 6:39 ` Frederic Weisbecker
2009-11-17 7:46 ` Lai Jiangshan
2009-11-17 13:37 ` Steven Rostedt
2009-11-17 15:07 ` Steven Rostedt
2009-11-18 11:13 ` [tip:tracing/core] tracing: Prevent " tip-bot for Lai Jiangshan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox