Sophie

Sophie

distrib > Mandriva > 8.2 > i586 > by-pkgid > 795ae080bdb8618620666fed9e003621 > files > 32

kernel22-2.2.25-1.1mdk.src.rpm

--- 2.2.18pre23aa1/arch/i386/kernel/traps.c.~1~	Sun Nov 26 05:35:36 2000
+++ 2.2.18pre23aa1/arch/i386/kernel/traps.c	Mon Nov 27 01:40:06 2000
@@ -128,7 +128,7 @@
 #define VMALLOC_OFFSET (8*1024*1024)
 #define MODULE_RANGE (8*1024*1024)
 
-static void show_registers(struct pt_regs *regs)
+void show_registers(struct pt_regs *regs)
 {
 	int i;
 	int in_kernel = 1;
--- 2.2.18pre23aa1/arch/i386/kernel/process.c.~1~	Sun Nov 26 05:35:33 2000
+++ 2.2.18pre23aa1/arch/i386/kernel/process.c	Mon Nov 27 01:40:17 2000
@@ -388,23 +388,15 @@
 
 void show_regs(struct pt_regs * regs)
 {
+	extern void show_registers(struct pt_regs *);
 	long cr0 = 0L, cr2 = 0L, cr3 = 0L;
 
 	printk("\n");
-	printk("EIP: %04x:[<%08lx>]",0xffff & regs->xcs,regs->eip);
-	if (regs->xcs & 3)
-		printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
-	printk(" EFLAGS: %08lx\n",regs->eflags);
-	printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-		regs->eax,regs->ebx,regs->ecx,regs->edx);
-	printk("ESI: %08lx EDI: %08lx EBP: %08lx",
-		regs->esi, regs->edi, regs->ebp);
-	printk(" DS: %04x ES: %04x\n",
-		0xffff & regs->xds,0xffff & regs->xes);
 	__asm__("movl %%cr0, %0": "=r" (cr0));
 	__asm__("movl %%cr2, %0": "=r" (cr2));
 	__asm__("movl %%cr3, %0": "=r" (cr3));
 	printk("CR0: %08lx CR2: %08lx CR3: %08lx\n", cr0, cr2, cr3);
+	show_registers(regs);
 }
 
 /*