patch-2.3.42 linux/arch/m68k/kernel/traps.c

• Lines: 69
• Date: Mon Jan 31 10:32:53 2000
• Orig file: v2.3.41/linux/arch/m68k/kernel/traps.c
• Orig date: Fri Jan 28 15:09:07 2000

diff -u --recursive --new-file v2.3.41/linux/arch/m68k/kernel/traps.c linux/arch/m68k/kernel/traps.c
@@ -37,9 +37,6 @@
 #include <asm/pgtable.h>
 #include <asm/machdep.h>
 #include <asm/siginfo.h>
-#ifdef CONFIG_KGDB
-#include <asm/kgdb.h>
-#endif
 
 /* assembler routines */
 asmlinkage void system_call(void);
@@ -766,11 +763,6 @@
 
 static void dump_stack(struct frame *fp)
 {
-#ifdef CONFIG_KGDB
-	/* This will never return to here, if kgdb has been initialized. And if
-	 * it returns from there, then to where the error happened... */
-	enter_kgdb( &fp->ptregs );
-#else
 	unsigned long *stack, *endstack, addr, module_start, module_end;
 	extern char _start, _etext;
 	int i;
@@ -868,15 +860,10 @@
 	for (i = 0; i < 10; i++)
 		printk("%04x ", 0xffff & ((short *) fp->ptregs.pc)[i]);
 	printk ("\n");
-#endif
 }
 
 void bad_super_trap (struct frame *fp)
 {
-#ifdef CONFIG_KGDB
-	/* Save the register dump if we'll enter kgdb anyways */
-	if (!kgdb_initialized) {
-#endif
 	console_verbose();
 	if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
 		printk ("*** %s ***   FORMAT=%X\n",
@@ -906,9 +893,6 @@
 				fp->ptregs.pc);
 	}
 	printk ("Current process id is %d\n", current->pid);
-#ifdef CONFIG_KGDB
-	}
-#endif
 	die_if_kernel("BAD KERNEL TRAP", &fp->ptregs, 0);
 }
 
@@ -1037,10 +1021,6 @@
 	if (!(fp->sr & PS_S))
 		return;
 
-#ifdef CONFIG_KGDB
-	/* Save the register dump if we'll enter kgdb anyways */
-	if (!kgdb_initialized) {
-#endif
 	console_verbose();
 	printk("%s: %08x\n",str,nr);
 	printk("PC: [<%08lx>]\nSR: %04x  SP: %p  a2: %08lx\n",
@@ -1052,9 +1032,6 @@
 
 	printk("Process %s (pid: %d, stackpage=%08lx)\n",
 		current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
-#ifdef CONFIG_KGDB
-	}
-#endif
 	dump_stack((struct frame *)fp);
 	do_exit(SIGSEGV);
 }