Ingo,
I based this on top of my last tip/tracing/urgent request. These are
enhancements and not fixes. But since the merge window is still open
and these are very small patches, I figured we try to get them in for
2.6.33.
Please pull the latest tip/tracing/core tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/core
Steven Rostedt (2):
tracing: Add trace_dump_stack()
tracing: Add stack trace to irqsoff tracer
----
include/linux/kernel.h | 2 ++
kernel/trace/trace.c | 16 ++++++++++++++++
kernel/trace/trace_irqsoff.c | 2 ++
3 files changed, 20 insertions(+), 0 deletions(-)
* Steven Rostedt <[email protected]> wrote:
> Ingo,
>
> I based this on top of my last tip/tracing/urgent request. These are
> enhancements and not fixes. But since the merge window is still open and
> these are very small patches, I figured we try to get them in for 2.6.33.
>
> Please pull the latest tip/tracing/core tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/tracing/core
>
>
> Steven Rostedt (2):
> tracing: Add trace_dump_stack()
> tracing: Add stack trace to irqsoff tracer
>
> ----
> include/linux/kernel.h | 2 ++
> kernel/trace/trace.c | 16 ++++++++++++++++
> kernel/trace/trace_irqsoff.c | 2 ++
> 3 files changed, 20 insertions(+), 0 deletions(-)
Pulled, thanks Steve!
Ingo
FYI, i noticed this new warning:
kernel/trace/trace.c: In function 'trace_dump_stack':
kernel/trace/trace.c:1161: warning: 'return' with a value, in function returning void
Ingo
On Mon, 2009-12-14 at 17:27 +0100, Ingo Molnar wrote:
> FYI, i noticed this new warning:
>
> kernel/trace/trace.c: In function 'trace_dump_stack':
> kernel/trace/trace.c:1161: warning: 'return' with a value, in function returning void
Hmm,
I could have sworn I tested for warnings, this must have slipped under
the radar :-/
I'll fix ASAP.
-- Steve
Ingo,
Please pull the latest tip/tracing/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent
Steven Rostedt (1):
tracing: Fix return of trace_dump_stack()
----
include/linux/kernel.h | 1 +
kernel/trace/trace.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---------------------------
commit aa43d935e677296088fb9b9c2060abbad0ccf648
Author: Steven Rostedt <[email protected]>
Date: Mon Dec 14 15:58:33 2009 -0500
tracing: Fix return of trace_dump_stack()
The trace_dump_stack() returned a value for a void function.
Also, added the missing stub for trace_dump_stack() when tracing is
not configured.
Reported-by: Ingo Molnar <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 5ad4199..f1dc752 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -527,6 +527,7 @@ trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
static inline void tracing_start(void) { }
static inline void tracing_stop(void) { }
static inline void ftrace_off_permanent(void) { }
+static inline void trace_dump_stack(void) { }
static inline int
trace_printk(const char *fmt, ...)
{
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f531301..1cf8734 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1159,7 +1159,7 @@ void trace_dump_stack(void)
unsigned long flags;
if (tracing_disabled || tracing_selftest_running)
- return 0;
+ return;
local_save_flags(flags);
* Steven Rostedt <[email protected]> wrote:
> Ingo,
>
> Please pull the latest tip/tracing/urgent tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/tracing/urgent
>
>
> Steven Rostedt (1):
> tracing: Fix return of trace_dump_stack()
>
> ----
> include/linux/kernel.h | 1 +
> kernel/trace/trace.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletions(-)
Pulled, thanks Steve!
Ingo
Commit-ID: e36c54582c6f14adc9e10473e2aec2cc4f0acc03
Gitweb: http://git.kernel.org/tip/e36c54582c6f14adc9e10473e2aec2cc4f0acc03
Author: Steven Rostedt <[email protected]>
AuthorDate: Mon, 14 Dec 2009 15:58:33 -0500
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 15 Dec 2009 08:36:11 +0100
tracing: Fix return of trace_dump_stack()
The trace_dump_stack() returned a value for a void function.
Also, added the missing stub for trace_dump_stack() when tracing is
not configured.
Reported-by: Ingo Molnar <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
include/linux/kernel.h | 1 +
kernel/trace/trace.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 5ad4199..f1dc752 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -527,6 +527,7 @@ trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
static inline void tracing_start(void) { }
static inline void tracing_stop(void) { }
static inline void ftrace_off_permanent(void) { }
+static inline void trace_dump_stack(void) { }
static inline int
trace_printk(const char *fmt, ...)
{
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index bd7b969..ee61915 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1158,7 +1158,7 @@ void trace_dump_stack(void)
unsigned long flags;
if (tracing_disabled || tracing_selftest_running)
- return 0;
+ return;
local_save_flags(flags);