x86: __show_registers() and __show_regs() API unification
PATCH 1/13 x86: __show_registers() and __show_regs() API unification
Quoted 1 line
From
37c80e22248d89c2785246c3f5db0e41223cfc4aMon Sep 17 00:00:00 2001
From: Pekka Enberg <[email protected]>
Date: Thu, 3 Apr 2008 16:40:48 +0300
Subject: [PATCH 01/13] x86: __show_registers() and __show_regs() API unification
Currently the low-level function to dump user-passed registers on i386 is called __show_registers() whereas on x86-64 it's called __show_regs(). Unify the API to simplify porting of kmemcheck to x86-64.
Cc Vegard Nossum <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/process_32.c | 4 ++-- arch/x86/kernel/process_64.c | 12 ++++++++---- arch/x86/kernel/traps_32.c | 2 +- arch/x86/kernel/traps_64.c | 2 +- include/asm-x86/kdebug.h | 3 +-- 5 files changed, 13 insertions(+), 10 deletions(-)
arch/x86/kernel/process_32.c +2 -2
@@ -194,7 +194,7 @@ void cpu_idle(void) } } -void __show_registers (struct pt_regs *regs,int all) +void __show_regs (struct pt_regs *regs,int all) {unsigned long cr0 =0L , cr2 =0L , cr3 =0L , cr4 =0L ;unsigned long d0, d1, d2, d3, d6, d7;
@@ -255,7 +255,7 @@ void __show_registers(struct pt_regs *regs, int all)void show_regs (struct pt_regs *regs) { -__show_registers (regs,1 ); +__show_regs (regs,1 );show_trace (NULL , regs, ®s->sp, regs->bp); }
arch/x86/kernel/process_64.c +8 -4
@@ -180,7 +180,7 @@ void cpu_idle(void) }/* Prints also some state that isn't saved in the pt_regs */ -void __show_regs (struct pt_regs * regs) +void __show_regs (struct pt_regs * regs,int all) {unsigned long cr0 =0L , cr2 =0L , cr3 =0L , cr4 =0L , fs, gs, shadowgs;unsigned long d0, d1, d2, d3, d6, d7;
@@ -219,13 +219,17 @@ void __show_regs(struct pt_regs * regs)rdmsrl (MSR_GS_BASE , gs);rdmsrl (MSR_KERNEL_GS_BASE , shadowgs); +printk ("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n" , + fs,fsindex,gs,gsindex,shadowgs); + +if (!all) +return ; + cr0 =read_cr0 (); cr2 =read_cr2 (); cr3 =read_cr3 (); cr4 =read_cr4 (); -printk ("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n" , - fs,fsindex,gs,gsindex,shadowgs);printk ("CS: %04x DS: %04x ES: %04x CR0: %016lx\n" , cs, ds, es, cr0);printk ("CR2: %016lx CR3: %016lx CR4: %016lx\n" , cr2, cr3, cr4);
@@ -242,7 +246,7 @@ void __show_regs(struct pt_regs * regs)void show_regs (struct pt_regs *regs) {printk ("CPU %d:" ,smp_processor_id ()); -__show_regs (regs); +__show_regs (regs,1 );show_trace (NULL , regs, (void *)(regs +1 ), regs->bp); }
arch/x86/kernel/traps_32.c +1 -1
@@ -330,7 +330,7 @@ void show_registers(struct pt_regs *regs)int i;print_modules (); -__show_registers (regs,0 ); +__show_regs (regs,0 ); printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)", TASK_COMM_LEN, current->comm, task_pid_nr(current),
arch/x86/kernel/traps_64.c +1 -1
@@ -470,7 +470,7 @@ void show_registers(struct pt_regs *regs) sp = regs->sp; ip = (u8 *) regs->ip - code_prologue;printk ("CPU %d " , cpu); -__show_regs (regs); +__show_regs (regs,1 );printk ("Process %s (pid: %d, threadinfo %p, task %p)\n" , cur->comm, cur->pid,task_thread_info (cur), cur);
include/asm-x86/kdebug.h +1 -2
@@ -27,10 +27,9 @@ extern void printk_address(unsigned long address, int reliable);extern void die (const char *,struct pt_regs *,long );extern int __must_check __die (const char *,struct pt_regs *,long );extern void show_registers (struct pt_regs *regs); -extern void __show_registers (struct pt_regs *,int all);extern void show_trace (struct task_struct *t,struct pt_regs *regs,unsigned long *sp,unsigned long bp); -extern void __show_regs (struct pt_regs *regs); +extern void __show_regs (struct pt_regs *regs,int all);extern void show_regs (struct pt_regs *regs);extern unsigned long oops_begin (void );extern void oops_end (unsigned long ,struct pt_regs *,int signr);
Signature · 1 line
1.5.5.1