History

s390/dumpstack: use pr_cont within show_stack and die

Use pr_cont instead of printk calls also within show_stack and die in order to avoid extra line breaks.

Heiko Carstens committed 10 years ago

Commit 47ece7f1 parent dcddba91 file · +8 −8Browse files

Showing the changes to arch/s390/kernel/dumpstack.c (1 of 1 file). Show all

Unified · Split

arch/s390/kernel/dumpstack.c+8−8
@@ -119,14 +119,14 @@ void show_stack(struct task_struct *task, unsigned long *sp) · 118 unmodified lines
119119 else
120120 stack = (unsigned long *)task->thread.ksp;
121121 }
122+ printk(KERN_DEFAULT "Stack:\n");
122123 for (i = 0; i < 20; i++) {
123124 if (((addr_t) stack & (THREAD_SIZE-1)) == 0)
124125 break;
125− if ((i * sizeof(long) % 32) == 0)
126− printk("%s ", i == 0 ? "" : "\n");
127− printk("%016lx ", *stack++);
126+ if (i % 4 == 0)
127+ printk(KERN_DEFAULT " ");
128+ pr_cont("%016lx%c", *stack++, i % 4 == 3 ? '\n' : ' ');
128129 }
129− printk("\n");
130130 show_trace(task, (unsigned long)sp);
131131 }
132132
@@ -186,14 +186,14 @@ void die(struct pt_regs *regs, const char *str) · 53 unmodified lines
186186 printk("%s: %04x ilc:%d [#%d] ", str, regs->int_code & 0xffff,
187187 regs->int_code >> 17, ++die_counter);
188188 #ifdef CONFIG_PREEMPT
189− printk("PREEMPT ");
189+ pr_cont("PREEMPT ");
190190 #endif
191191 #ifdef CONFIG_SMP
192− printk("SMP ");
192+ pr_cont("SMP ");
193193 #endif
194194 if (debug_pagealloc_enabled())
195− printk("DEBUG_PAGEALLOC");
196− printk("\n");
195+ pr_cont("DEBUG_PAGEALLOC");
196+ pr_cont("\n");
197197 notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV);
198198 print_modules();
199199 show_regs(regs);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t