diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /arch/mips/kernel/unaligned.c | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/mips/kernel/unaligned.c')
| -rw-r--r-- | arch/mips/kernel/unaligned.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index bf4c4a979abb..67bd626942ab 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c | |||
| @@ -482,19 +482,19 @@ fault: | |||
| 482 | return; | 482 | return; |
| 483 | 483 | ||
| 484 | die_if_kernel("Unhandled kernel unaligned access", regs); | 484 | die_if_kernel("Unhandled kernel unaligned access", regs); |
| 485 | send_sig(SIGSEGV, current, 1); | 485 | force_sig(SIGSEGV, current); |
| 486 | 486 | ||
| 487 | return; | 487 | return; |
| 488 | 488 | ||
| 489 | sigbus: | 489 | sigbus: |
| 490 | die_if_kernel("Unhandled kernel unaligned access", regs); | 490 | die_if_kernel("Unhandled kernel unaligned access", regs); |
| 491 | send_sig(SIGBUS, current, 1); | 491 | force_sig(SIGBUS, current); |
| 492 | 492 | ||
| 493 | return; | 493 | return; |
| 494 | 494 | ||
| 495 | sigill: | 495 | sigill: |
| 496 | die_if_kernel("Unhandled kernel unaligned access or invalid instruction", regs); | 496 | die_if_kernel("Unhandled kernel unaligned access or invalid instruction", regs); |
| 497 | send_sig(SIGILL, current, 1); | 497 | force_sig(SIGILL, current); |
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | asmlinkage void do_ade(struct pt_regs *regs) | 500 | asmlinkage void do_ade(struct pt_regs *regs) |