Merge branch 'eseries' into pxa

[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / stacktrace.c

diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c
index 515ff9011dd742e33a5bfb54c4d55d99818937d9..85e46a5d0e0801d9880987cd2595a06391231401 100644 (file)
--- a/arch/s390/kernel/stacktrace.c
+++ b/arch/s390/kernel/stacktrace.c
@@ -12,10 +12,10 @@
 #include <linux/kallsyms.h>
 
 static unsigned long save_context_stack(struct stack_trace *trace,
-                                       unsigned int *skip,
                                        unsigned long sp,
                                        unsigned long low,
-                                       unsigned long high)
+                                       unsigned long high,
+                                       int savesched)
 {
        struct stack_frame *sf;
        struct pt_regs *regs;
@@ -28,10 +28,10 @@ static unsigned long save_context_stack(struct stack_trace *trace,
                sf = (struct stack_frame *)sp;
                while(1) {
                        addr = sf->gprs[8] & PSW_ADDR_INSN;
-                       if (!(*skip))
+                       if (!trace->skip)
                                trace->entries[trace->nr_entries++] = addr;
                        else
-                               (*skip)--;
+                               trace->skip--;
                        if (trace->nr_entries >= trace->max_entries)
                                return sp;
                        low = sp;
@@ -48,10 +48,12 @@ static unsigned long save_context_stack(struct stack_trace *trace,
                        return sp;
                regs = (struct pt_regs *)sp;
                addr = regs->psw.addr & PSW_ADDR_INSN;
-               if (!(*skip))
-                       trace->entries[trace->nr_entries++] = addr;
-               else
-                       (*skip)--;
+               if (savesched || !in_sched_functions(addr)) {
+                       if (!trace->skip)
+                               trace->entries[trace->nr_entries++] = addr;
+                       else
+                               trace->skip--;
+               }
                if (trace->nr_entries >= trace->max_entries)
                        return sp;
                low = sp;
@@ -65,20 +67,29 @@ void save_stack_trace(struct stack_trace *trace)
        unsigned long orig_sp, new_sp;
 
        orig_sp = sp & PSW_ADDR_INSN;
-
-       new_sp = save_context_stack(trace, &trace->skip, orig_sp,
-                               S390_lowcore.panic_stack - PAGE_SIZE,
-                               S390_lowcore.panic_stack);
+       new_sp = save_context_stack(trace, orig_sp,
+                                   S390_lowcore.panic_stack - PAGE_SIZE,
+                                   S390_lowcore.panic_stack, 1);
        if (new_sp != orig_sp)
                return;
-       new_sp = save_context_stack(trace, &trace->skip, new_sp,
-                               S390_lowcore.async_stack - ASYNC_SIZE,
-                               S390_lowcore.async_stack);
+       new_sp = save_context_stack(trace, new_sp,
+                                   S390_lowcore.async_stack - ASYNC_SIZE,
+                                   S390_lowcore.async_stack, 1);
        if (new_sp != orig_sp)
                return;
-
-       save_context_stack(trace, &trace->skip, new_sp,
+       save_context_stack(trace, new_sp,
                           S390_lowcore.thread_info,
-                          S390_lowcore.thread_info + THREAD_SIZE);
-       return;
+                          S390_lowcore.thread_info + THREAD_SIZE, 1);
+}
+
+void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
+{
+       unsigned long sp, low, high;
+
+       sp = tsk->thread.ksp & PSW_ADDR_INSN;
+       low = (unsigned long) task_stack_page(tsk);
+       high = (unsigned long) task_pt_regs(tsk);
+       save_context_stack(trace, sp, low, high, 0);
+       if (trace->nr_entries < trace->max_entries)
+               trace->entries[trace->nr_entries++] = ULONG_MAX;
 }