Commit 5c699714 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Print kernel version in dump_stack() and show_regs(). 



Also print PREEMPT and/or SMP if the kernel was configured that way.
Makes s390 look a bit more like other architectures.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 5fd9c6e2

arch/s390/kernel/process.c

+10 −8
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/notifier.h>



#include <linux/utsname.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/system.h>
@@ -182,13 +182,15 @@ void cpu_idle(void) 


void show_regs(struct pt_regs *regs)

{

	struct task_struct *tsk = current;



        printk("CPU:    %d    %s\n", task_thread_info(tsk)->cpu, print_tainted());

	print_modules();

	printk("CPU: %d %s %s %.*s\n",

	       task_thread_info(current)->cpu, print_tainted(),

	       init_utsname()->release,

	       (int)strcspn(init_utsname()->version, " "),

	       init_utsname()->version);

	printk("Process %s (pid: %d, task: %p, ksp: %p)\n",

	       current->comm, task_pid_nr(current), (void *) tsk,

	       (void *) tsk->thread.ksp);



	       current->comm, current->pid, current,

	       (void *) current->thread.ksp);

	show_registers(regs);

	/* Show stack backtrace if pt_regs is from kernel mode */

	if (!(regs->psw.mask & PSW_MASK_PSTATE))

arch/s390/kernel/traps.c

+17 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/reboot.h>

#include <linux/kprobes.h>

#include <linux/bug.h>

#include <linux/utsname.h>

#include <asm/system.h>

#include <asm/uaccess.h>

#include <asm/io.h>
@@ -168,9 +169,16 @@ void show_stack(struct task_struct *task, unsigned long *sp) 
 */

void dump_stack(void)

{

	printk("CPU: %d %s %s %.*s\n",

	       task_thread_info(current)->cpu, print_tainted(),

	       init_utsname()->release,

	       (int)strcspn(init_utsname()->version, " "),

	       init_utsname()->version);

	printk("Process %s (pid: %d, task: %p, ksp: %p)\n",

	       current->comm, current->pid, current,

	       (void *) current->thread.ksp);

	show_stack(NULL, NULL);

}



EXPORT_SYMBOL(dump_stack);



static inline int mask_bits(struct pt_regs *regs, unsigned long bits)
@@ -258,8 +266,14 @@ void die(const char * str, struct pt_regs * regs, long err) 
	console_verbose();

	spin_lock_irq(&die_lock);

	bust_spinlocks(1);

	printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);

	print_modules();

	printk("%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);

#ifdef CONFIG_PREEMPT

	printk("PREEMPT ");

#endif

#ifdef CONFIG_SMP

	printk("SMP");

#endif

	printk("\n");

	notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);

	show_regs(regs);

	bust_spinlocks(0);