diff options
| author | 2008-10-31 00:38:21 +0100 | |
|---|---|---|
| committer | 2008-10-31 00:38:21 +0100 | |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /kernel/trace/trace_stack.c | |
| parent | ftrace: ftrace dump on oops control (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 74c5d9a3afae..be682b62fe58 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -44,6 +44,10 @@ static inline void check_stack(void) if (this_size <= max_stack_size) return; + /* we do not handle interrupt stacks yet */ + if (!object_is_on_stack(&this_size)) + return; + raw_local_irq_save(flags); __raw_spin_lock(&max_stack_lock); |
