aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/avr32/kernel/traps.c2
-rw-r--r--arch/i386/kernel/traps.c2
-rw-r--r--arch/parisc/kernel/traps.c2
-rw-r--r--arch/powerpc/kernel/traps.c2
-rw-r--r--arch/ppc/kernel/traps.c2
-rw-r--r--arch/s390/kernel/traps.c2
-rw-r--r--arch/sh/kernel/traps.c2
-rw-r--r--arch/x86_64/kernel/traps.c2
-rw-r--r--include/linux/bug.h7
-rw-r--r--lib/bug.c5
10 files changed, 16 insertions, 12 deletions
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index 86d107511dd4..aaa792815cd7 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -184,7 +184,7 @@ asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs)
184 if (!user_mode(regs) && (ecr == ECR_ILLEGAL_OPCODE)) { 184 if (!user_mode(regs) && (ecr == ECR_ILLEGAL_OPCODE)) {
185 enum bug_trap_type type; 185 enum bug_trap_type type;
186 186
187 type = report_bug(regs->pc); 187 type = report_bug(regs->pc, regs);
188 switch (type) { 188 switch (type) {
189 case BUG_TRAP_TYPE_NONE: 189 case BUG_TRAP_TYPE_NONE:
190 break; 190 break;
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 90da0575fcff..28bd1c5163ec 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -390,7 +390,7 @@ void die(const char * str, struct pt_regs * regs, long err)
390 unsigned long esp; 390 unsigned long esp;
391 unsigned short ss; 391 unsigned short ss;
392 392
393 report_bug(regs->eip); 393 report_bug(regs->eip, regs);
394 394
395 printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); 395 printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
396#ifdef CONFIG_PREEMPT 396#ifdef CONFIG_PREEMPT
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index c3ec9f1ec0f3..f9bca2d74b38 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -302,7 +302,7 @@ static void handle_break(struct pt_regs *regs)
302 if (unlikely(iir == PARISC_BUG_BREAK_INSN && !user_mode(regs))) { 302 if (unlikely(iir == PARISC_BUG_BREAK_INSN && !user_mode(regs))) {
303 /* check if a BUG() or WARN() trapped here. */ 303 /* check if a BUG() or WARN() trapped here. */
304 enum bug_trap_type tt; 304 enum bug_trap_type tt;
305 tt = report_bug(regs->iaoq[0] & ~3); 305 tt = report_bug(regs->iaoq[0] & ~3, regs);
306 if (tt == BUG_TRAP_TYPE_WARN) { 306 if (tt == BUG_TRAP_TYPE_WARN) {
307 regs->iaoq[0] += 4; 307 regs->iaoq[0] += 4;
308 regs->iaoq[1] += 4; 308 regs->iaoq[1] += 4;
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index bf6445ac9f1c..3b8427e6283d 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -777,7 +777,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
777 return; 777 return;
778 778
779 if (!(regs->msr & MSR_PR) && /* not user-mode */ 779 if (!(regs->msr & MSR_PR) && /* not user-mode */
780 report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) { 780 report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {
781 regs->nip += 4; 781 regs->nip += 4;
782 return; 782 return;
783 } 783 }
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index aea100be52c8..0eaef7c8378b 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -619,7 +619,7 @@ void program_check_exception(struct pt_regs *regs)
619 return; 619 return;
620 620
621 if (!(regs->msr & MSR_PR) && /* not user-mode */ 621 if (!(regs->msr & MSR_PR) && /* not user-mode */
622 report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) { 622 report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {
623 regs->nip += 4; 623 regs->nip += 4;
624 return; 624 return;
625 } 625 }
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index ee9186f8fb08..81e03b9c3841 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -319,7 +319,7 @@ static void __kprobes inline do_trap(long interruption_code, int signr,
319 else { 319 else {
320 enum bug_trap_type btt; 320 enum bug_trap_type btt;
321 321
322 btt = report_bug(regs->psw.addr & PSW_ADDR_INSN); 322 btt = report_bug(regs->psw.addr & PSW_ADDR_INSN, regs);
323 if (btt == BUG_TRAP_TYPE_WARN) 323 if (btt == BUG_TRAP_TYPE_WARN)
324 return; 324 return;
325 die(str, regs, interruption_code); 325 die(str, regs, interruption_code);
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 8f18930d5bf8..09480887076b 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -874,7 +874,7 @@ void __init trap_init(void)
874void handle_BUG(struct pt_regs *regs) 874void handle_BUG(struct pt_regs *regs)
875{ 875{
876 enum bug_trap_type tt; 876 enum bug_trap_type tt;
877 tt = report_bug(regs->pc); 877 tt = report_bug(regs->pc, regs);
878 if (tt == BUG_TRAP_TYPE_WARN) { 878 if (tt == BUG_TRAP_TYPE_WARN) {
879 regs->pc += 2; 879 regs->pc += 2;
880 return; 880 return;
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index aac1c0be54c6..7fa155c394d9 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -531,7 +531,7 @@ void die(const char * str, struct pt_regs * regs, long err)
531 unsigned long flags = oops_begin(); 531 unsigned long flags = oops_begin();
532 532
533 if (!user_mode(regs)) 533 if (!user_mode(regs))
534 report_bug(regs->rip); 534 report_bug(regs->rip, regs);
535 535
536 __die(str, regs, err); 536 __die(str, regs, err);
537 oops_end(flags); 537 oops_end(flags);
diff --git a/include/linux/bug.h b/include/linux/bug.h
index 42aa0a54b6f4..54398d2c6d8d 100644
--- a/include/linux/bug.h
+++ b/include/linux/bug.h
@@ -10,6 +10,8 @@ enum bug_trap_type {
10 BUG_TRAP_TYPE_BUG = 2, 10 BUG_TRAP_TYPE_BUG = 2,
11}; 11};
12 12
13struct pt_regs;
14
13#ifdef CONFIG_GENERIC_BUG 15#ifdef CONFIG_GENERIC_BUG
14#include <asm-generic/bug.h> 16#include <asm-generic/bug.h>
15 17
@@ -20,7 +22,7 @@ static inline int is_warning_bug(const struct bug_entry *bug)
20 22
21const struct bug_entry *find_bug(unsigned long bugaddr); 23const struct bug_entry *find_bug(unsigned long bugaddr);
22 24
23enum bug_trap_type report_bug(unsigned long bug_addr); 25enum bug_trap_type report_bug(unsigned long bug_addr, struct pt_regs *regs);
24 26
25int module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *, 27int module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
26 struct module *); 28 struct module *);
@@ -31,7 +33,8 @@ int is_valid_bugaddr(unsigned long addr);
31 33
32#else /* !CONFIG_GENERIC_BUG */ 34#else /* !CONFIG_GENERIC_BUG */
33 35
34static inline enum bug_trap_type report_bug(unsigned long bug_addr) 36static inline enum bug_trap_type report_bug(unsigned long bug_addr,
37 struct pt_regs *regs)
35{ 38{
36 return BUG_TRAP_TYPE_BUG; 39 return BUG_TRAP_TYPE_BUG;
37} 40}
diff --git a/lib/bug.c b/lib/bug.c
index 014b582c5c4b..530f38f55787 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -38,6 +38,7 @@
38#include <linux/list.h> 38#include <linux/list.h>
39#include <linux/module.h> 39#include <linux/module.h>
40#include <linux/bug.h> 40#include <linux/bug.h>
41#include <linux/sched.h>
41 42
42extern const struct bug_entry __start___bug_table[], __stop___bug_table[]; 43extern const struct bug_entry __start___bug_table[], __stop___bug_table[];
43 44
@@ -112,7 +113,7 @@ const struct bug_entry *find_bug(unsigned long bugaddr)
112 return module_find_bug(bugaddr); 113 return module_find_bug(bugaddr);
113} 114}
114 115
115enum bug_trap_type report_bug(unsigned long bugaddr) 116enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
116{ 117{
117 const struct bug_entry *bug; 118 const struct bug_entry *bug;
118 const char *file; 119 const char *file;
@@ -147,7 +148,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr)
147 "[verbose debug info unavailable]\n", 148 "[verbose debug info unavailable]\n",
148 (void *)bugaddr); 149 (void *)bugaddr);
149 150
150 dump_stack(); 151 show_regs(regs);
151 return BUG_TRAP_TYPE_WARN; 152 return BUG_TRAP_TYPE_WARN;
152 } 153 }
153 154