patch-2.4.21 linux-2.4.21/include/asm-x86_64/kdebug.h

Next file: linux-2.4.21/include/asm-x86_64/kmap_types.h
Previous file: linux-2.4.21/include/asm-x86_64/io.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/include/asm-x86_64/kdebug.h linux-2.4.21/include/asm-x86_64/kdebug.h
@@ -9,8 +9,12 @@
 	struct pt_regs *regs;
 	const char *str;
 	long err; 
+	int trapnr;
+	int signr;
 }; 
 
+/* Note - you should never unregister because that can race with NMIs.
+   If you really want to do it use RCU infrastructure. */
 extern struct notifier_block *die_chain;
 
 /* Grossly misnamed. */
@@ -21,18 +25,21 @@
 	DIE_PANIC,
 	DIE_NMI,
 	DIE_DIE,
+	DIE_NMIWATCHDOG,
+	DIE_KERNELDEBUG,
+	DIE_TRAP,
+	DIE_GPF,
 	DIE_CALL,
-	DIE_CPUINIT,	/* not really a die, but .. */
-	DIE_TRAPINIT,	/* not really a die, but .. */
-	DIE_STOP, 
 }; 
 
-static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err)
+static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap,int sig)
 { 
-	struct die_args args = { regs: regs, str: str, err: err }; 
+	struct die_args args = { regs: regs, str: str, err: err, trapnr: trap,
+	signr: sig}; 
 	return notifier_call_chain(&die_chain, val, &args); 
 } 
 
+
 extern int printk_address(unsigned long address);
 extern void die(const char *,struct pt_regs *,long);
 extern void show_stack(unsigned long* esp);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)