next-2008-11-27: tracing on alpha (again)

next-2008-11-27: tracing on alpha (again)

[Alexey Dobriyan]

On alpha-smp-n-debug-y:

  CC      kernel/trace/trace.o
kernel/trace/trace.c: In function 'ftrace_trace_userstack':
kernel/trace/trace.c:968: error: storage size of 'trace' isn't known
kernel/trace/trace.c:968: warning: unused variable 'trace'
make[3]: *** [kernel/trace/trace.o] Error 1
  CC      kernel/trace/trace_branch.o
kernel/trace/trace_branch.c: In function 'probe_likely_condition':
kernel/trace/trace_branch.c:44: error: implicit declaration of function 'raw_local_irq_save'
kernel/trace/trace_branch.c:76: error: implicit declaration of function 'raw_local_irq_restore'

Re: next-2008-11-27: tracing on alpha (again)

[Frédéric Weisbecker]

2008/11/28 Alexey Dobriyan <adobriyan@gmail.com>:
> On alpha-smp-n-debug-y:
>
>  CC      kernel/trace/trace.o
> kernel/trace/trace.c: In function 'ftrace_trace_userstack':
> kernel/trace/trace.c:968: error: storage size of 'trace' isn't known
> kernel/trace/trace.c:968: warning: unused variable 'trace'
> make[3]: *** [kernel/trace/trace.o] Error 1


I think it needs a missing #ifdef CONFIG_STACKTRACE inside
ftrace_trace_userstack.

>  CC      kernel/trace/trace_branch.o
> kernel/trace/trace_branch.c: In function 'probe_likely_condition':
> kernel/trace/trace_branch.c:44: error: implicit declaration of function 'raw_local_irq_save'
> kernel/trace/trace_branch.c:76: error: implicit declaration of function 'raw_local_irq_restore'
>

Needs a missing #include <linux/irqflags.h>

I don't have time to submit patches now. Probably this night....

[PATCH] fix build: add missing #ifdef CONFIG_STACKTRACE

[Török Edwin]

Signed-off-by: Török Edwin <edwintorok@gmail.com>
---
 kernel/trace/trace.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5811e0a..91887a2 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -983,6 +983,7 @@ static void ftrace_trace_userstack(struct trace_array *tr,
 		   struct trace_array_cpu *data,
 		   unsigned long flags, int pc)
 {
+#ifdef CONFIG_STACKTRACE
 	struct ring_buffer_event *event;
 	struct userstack_entry *entry;
 	struct stack_trace trace;
@@ -1008,6 +1009,7 @@ static void ftrace_trace_userstack(struct trace_array *tr,
 
 	save_stack_trace_user(&trace);
 	ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
+#endif
 }
 
 void __trace_userstack(struct trace_array *tr,
-- 
1.5.6.5

Re: [PATCH] fix build: add missing #ifdef CONFIG_STACKTRACE

[Ingo Molnar]

* Török Edwin <edwintorok@gmail.com> wrote:

> 
> Signed-off-by: Török Edwin <edwintorok@gmail.com>
> ---
>  kernel/trace/trace.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

applied to tip/tracing/stack-tracer, and pushed out into ftrace-next, thanks 
Edwin!

	Ingo