---

yaml --- r: 71040 b: refs/heads/master c: 35cc461 h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 0b754a9 · 0b754a9
1 parent 0581a9e
commit 0b754a9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 64 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612d26a72a3fad16a0a5e37f7b1652a0ea965fc0
+refs/heads/master: 35cc46119d256364f179d7b3554f06ba468af3f7
diff --git a/trunk/include/asm-x86/kdebug.h b/trunk/include/asm-x86/kdebug.h
@@ -1,5 +1,33 @@
-#ifdef CONFIG_X86_32
-# include "kdebug_32.h"
-#else
-# include "kdebug_64.h"
+#ifndef _ASM_X86_KDEBUG_H
+#define _ASM_X86_KDEBUG_H
+
+#include <linux/notifier.h>
+
+struct pt_regs;
+
+/* Grossly misnamed. */
+enum die_val {
+	DIE_OOPS = 1,
+	DIE_INT3,
+	DIE_DEBUG,
+	DIE_PANIC,
+	DIE_NMI,
+	DIE_DIE,
+	DIE_NMIWATCHDOG,
+	DIE_KERNELDEBUG,
+	DIE_TRAP,
+	DIE_GPF,
+	DIE_CALL,
+	DIE_NMI_IPI,
+	DIE_PAGE_FAULT,
+};
+
+extern void printk_address(unsigned long address);
+extern void die(const char *,struct pt_regs *,long);
+extern void __die(const char *,struct pt_regs *,long);
+extern void show_registers(struct pt_regs *regs);
+extern void dump_pagetable(unsigned long);
+extern unsigned long oops_begin(void);
+extern void oops_end(unsigned long);
+
 #endif
diff --git a/trunk/include/asm-x86/kdebug_32.h b/trunk/include/asm-x86/kdebug_32.h
diff --git a/trunk/include/asm-x86/kdebug_64.h b/trunk/include/asm-x86/kdebug_64.h