diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 4025fe4..8a2f6e7 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -89,6 +89,7 @@ print_context_stack(struct thread_info *tinfo, unsigned long *end, int *graph) { struct stack_frame *frame = (struct stack_frame *)bp; + int limit = 10; while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) { unsigned long addr; @@ -103,6 +104,9 @@ print_context_stack(struct thread_info *tinfo, ops->address(data, addr, 0); } print_ftrace_graph_addr(addr, data, ops, tinfo, graph); + + if (--limit <= 0) + break; } stack++; } diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index c99f9ed..895226e 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c @@ -86,12 +86,14 @@ void show_registers(struct pt_regs *regs) { int i; +#if 0 print_modules(); __show_regs(regs, 0); printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n", TASK_COMM_LEN, current->comm, task_pid_nr(current), current_thread_info(), current, task_thread_info(current)); +#endif /* * When in-kernel, we also print out the stack and code at the * time of the fault.. @@ -105,6 +107,7 @@ void show_registers(struct pt_regs *regs) printk(KERN_EMERG "Stack:\n"); show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG); +#if 0 printk(KERN_EMERG "Code: "); ip = (u8 *)regs->ip - code_prologue; @@ -124,6 +127,7 @@ void show_registers(struct pt_regs *regs) else printk(KERN_CONT "%02x ", c); } +#endif } printk(KERN_CONT "\n"); } diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 17107bd..ee8711c 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -253,11 +253,13 @@ void show_registers(struct pt_regs *regs) struct task_struct *cur = current; sp = regs->sp; +#if 0 printk("CPU %d ", cpu); print_modules(); __show_regs(regs, 1); printk("Process %s (pid: %d, threadinfo %p, task %p)\n", cur->comm, cur->pid, task_thread_info(cur), cur); +#endif /* * When in-kernel, we also print out the stack and code at the @@ -272,7 +274,7 @@ void show_registers(struct pt_regs *regs) printk(KERN_DEFAULT "Stack:\n"); show_stack_log_lvl(NULL, regs, (unsigned long *)sp, 0, KERN_DEFAULT); - +#if 0 printk(KERN_DEFAULT "Code: "); ip = (u8 *)regs->ip - code_prologue; @@ -292,6 +294,7 @@ void show_registers(struct pt_regs *regs) else printk(KERN_CONT "%02x ", c); } +#endif } printk(KERN_CONT "\n"); }