Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / kernel / trace / trace_stack.c

diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 74c5d9a..be682b6 100644 (file)
--- 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);