diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/avr32/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/i386/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/ppc/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/s390/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/traps.c | 2 |
8 files changed, 8 insertions, 8 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) | |||
874 | void handle_BUG(struct pt_regs *regs) | 874 | void 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); |