Merge branch 'linux-2.6' into merge

[sfrench/cifs-2.6.git] / lib / bug.c

diff --git a/lib/bug.c b/lib/bug.c
index 014b582c5c4b6a058058778d6100012a92501459..530f38f55787ec8703375c7706ae49fc7f529f7b 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -38,6 +38,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/bug.h>
+#include <linux/sched.h>
 
 extern const struct bug_entry __start___bug_table[], __stop___bug_table[];
 
@@ -112,7 +113,7 @@ const struct bug_entry *find_bug(unsigned long bugaddr)
        return module_find_bug(bugaddr);
 }
 
-enum bug_trap_type report_bug(unsigned long bugaddr)
+enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 {
        const struct bug_entry *bug;
        const char *file;
@@ -147,7 +148,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr)
                               "[verbose debug info unavailable]\n",
                               (void *)bugaddr);
 
-               dump_stack();
+               show_regs(regs);
                return BUG_TRAP_TYPE_WARN;
        }