Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 814e2c84 authored by Andy Isaacson's avatar Andy Isaacson Committed by Ingo Molnar
Browse files

x86: Factor duplicated code out of __show_regs() into show_regs_common() 



Unify x86_32 and x86_64 implementations of __show_regs() header,
standardizing on the x86_64 format string in the process. Also,
32-bit will now call print_modules.

Signed-off-by: default avatarAndy Isaacson <adi@hexapodia.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Robert Hancock <hancockrwd@gmail.com>
Cc: Richard Zidlicky <rz@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20091208082942.GA27174@hexapodia.org>
[ v2: resolved conflict ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f58e1f53

arch/x86/include/asm/system.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct task_struct *__switch_to(struct task_struct *prev, 
struct tss_struct;

void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,

		      struct tss_struct *tss);

extern void show_regs_common(void);



#ifdef CONFIG_X86_32

arch/x86/kernel/process.c

+18 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include <linux/clockchips.h>

#include <linux/random.h>

#include <linux/user-return-notifier.h>

#include <linux/dmi.h>

#include <linux/utsname.h>

#include <trace/events/power.h>

#include <linux/hw_breakpoint.h>

#include <asm/system.h>
@@ -90,6 +92,22 @@ void exit_thread(void) 
	}

}



void show_regs_common(void)

{

	const char *board;



	board = dmi_get_system_info(DMI_PRODUCT_NAME);

	if (!board)

		board = "";



	printk("\n");

	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",

		current->pid, current->comm, print_tainted(),

		init_utsname()->release,

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

		init_utsname()->version, board);

}



void flush_thread(void)

{

	struct task_struct *tsk = current;

arch/x86/kernel/process_32.c

+1 −13
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/vmalloc.h>

#include <linux/user.h>

#include <linux/interrupt.h>

#include <linux/utsname.h>

#include <linux/delay.h>

#include <linux/reboot.h>

#include <linux/init.h>
@@ -35,7 +34,6 @@ 
#include <linux/tick.h>

#include <linux/percpu.h>

#include <linux/prctl.h>

#include <linux/dmi.h>

#include <linux/ftrace.h>

#include <linux/uaccess.h>

#include <linux/io.h>
@@ -128,7 +126,6 @@ void __show_regs(struct pt_regs *regs, int all) 
	unsigned long d0, d1, d2, d3, d6, d7;

	unsigned long sp;

	unsigned short ss, gs;

	const char *board;



	if (user_mode_vm(regs)) {

		sp = regs->sp;
@@ -140,16 +137,7 @@ void __show_regs(struct pt_regs *regs, int all) 
		savesegment(gs, gs);

	}



	printk("\n");



	board = dmi_get_system_info(DMI_PRODUCT_NAME);

	if (!board)

		board = "";

	printk("Pid: %d, comm: %s %s (%s %.*s) %s\n",

			task_pid_nr(current), current->comm,

			print_tainted(), init_utsname()->release,

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

			init_utsname()->version, board);

	show_regs_common();



	printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",

			(u16)regs->cs, regs->ip, regs->flags,

arch/x86/kernel/process_64.c

+2 −14
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/slab.h>

#include <linux/user.h>

#include <linux/interrupt.h>

#include <linux/utsname.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/ptrace.h>
@@ -38,7 +37,6 @@ 
#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/ftrace.h>

#include <linux/dmi.h>



#include <asm/pgtable.h>

#include <asm/system.h>
@@ -163,18 +161,8 @@ void __show_regs(struct pt_regs *regs, int all) 
	unsigned long d0, d1, d2, d3, d6, d7;

	unsigned int fsindex, gsindex;

	unsigned int ds, cs, es;

	const char *board;



	printk("\n");

	print_modules();

	board = dmi_get_system_info(DMI_PRODUCT_NAME);

	if (!board)

		board = "";

	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",

		current->pid, current->comm, print_tainted(),

		init_utsname()->release,

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

		init_utsname()->version, board);



	show_regs_common();

	printk(KERN_INFO "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);

	printk_address(regs->ip, 1);

	printk(KERN_INFO "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,