Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / include / linux / stacktrace.h

diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h
index 50e2b01..5da9794 100644 (file)
--- a/include/linux/stacktrace.h
+++ b/include/linux/stacktrace.h
@@ -6,16 +6,17 @@ struct stack_trace {
        unsigned int nr_entries, max_entries;
        unsigned long *entries;
        int skip;       /* input argument: How many entries to skip */
-       int all_contexts; /* input argument: if true do than one stack */
 };
 
-extern void save_stack_trace(struct stack_trace *trace,
-                            struct task_struct *task);
+extern void save_stack_trace(struct stack_trace *trace);
+extern void save_stack_trace_tsk(struct task_struct *tsk,
+                               struct stack_trace *trace);
 
 extern void print_stack_trace(struct stack_trace *trace, int spaces);
 #else
-# define save_stack_trace(trace, task)                 do { } while (0)
-# define print_stack_trace(trace)                      do { } while (0)
+# define save_stack_trace(trace)                       do { } while (0)
+# define save_stack_trace_tsk(tsk, trace)              do { } while (0)
+# define print_stack_trace(trace, spaces)              do { } while (0)
 #endif
 
 #endif