diff options
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/traps.c | 14 | ||||
-rw-r--r-- | arch/parisc/kernel/unaligned.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 096e319adeb3..58dcf445e32f 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
@@ -275,7 +275,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) | |||
275 | static void handle_gdb_break(struct pt_regs *regs, int wot) | 275 | static void handle_gdb_break(struct pt_regs *regs, int wot) |
276 | { | 276 | { |
277 | force_sig_fault(SIGTRAP, wot, | 277 | force_sig_fault(SIGTRAP, wot, |
278 | (void __user *) (regs->iaoq[0] & ~3), current); | 278 | (void __user *) (regs->iaoq[0] & ~3)); |
279 | } | 279 | } |
280 | 280 | ||
281 | static void handle_break(struct pt_regs *regs) | 281 | static void handle_break(struct pt_regs *regs) |
@@ -609,13 +609,13 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
609 | si_code = ILL_PRVREG; | 609 | si_code = ILL_PRVREG; |
610 | give_sigill: | 610 | give_sigill: |
611 | force_sig_fault(SIGILL, si_code, | 611 | force_sig_fault(SIGILL, si_code, |
612 | (void __user *) regs->iaoq[0], current); | 612 | (void __user *) regs->iaoq[0]); |
613 | return; | 613 | return; |
614 | 614 | ||
615 | case 12: | 615 | case 12: |
616 | /* Overflow Trap, let the userland signal handler do the cleanup */ | 616 | /* Overflow Trap, let the userland signal handler do the cleanup */ |
617 | force_sig_fault(SIGFPE, FPE_INTOVF, | 617 | force_sig_fault(SIGFPE, FPE_INTOVF, |
618 | (void __user *) regs->iaoq[0], current); | 618 | (void __user *) regs->iaoq[0]); |
619 | return; | 619 | return; |
620 | 620 | ||
621 | case 13: | 621 | case 13: |
@@ -627,7 +627,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
627 | * to by si_addr. | 627 | * to by si_addr. |
628 | */ | 628 | */ |
629 | force_sig_fault(SIGFPE, FPE_CONDTRAP, | 629 | force_sig_fault(SIGFPE, FPE_CONDTRAP, |
630 | (void __user *) regs->iaoq[0], current); | 630 | (void __user *) regs->iaoq[0]); |
631 | return; | 631 | return; |
632 | } | 632 | } |
633 | /* The kernel doesn't want to handle condition codes */ | 633 | /* The kernel doesn't want to handle condition codes */ |
@@ -739,7 +739,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
739 | force_sig_fault(SIGSEGV, SEGV_MAPERR, | 739 | force_sig_fault(SIGSEGV, SEGV_MAPERR, |
740 | (code == 7)? | 740 | (code == 7)? |
741 | ((void __user *) regs->iaoq[0]) : | 741 | ((void __user *) regs->iaoq[0]) : |
742 | ((void __user *) regs->ior), current); | 742 | ((void __user *) regs->ior)); |
743 | return; | 743 | return; |
744 | 744 | ||
745 | case 28: | 745 | case 28: |
@@ -754,7 +754,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
754 | task_pid_nr(current), current->comm); | 754 | task_pid_nr(current), current->comm); |
755 | /* SIGBUS, for lack of a better one. */ | 755 | /* SIGBUS, for lack of a better one. */ |
756 | force_sig_fault(SIGBUS, BUS_OBJERR, | 756 | force_sig_fault(SIGBUS, BUS_OBJERR, |
757 | (void __user *)regs->ior, current); | 757 | (void __user *)regs->ior); |
758 | return; | 758 | return; |
759 | } | 759 | } |
760 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); | 760 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); |
@@ -770,7 +770,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
770 | code, fault_space, | 770 | code, fault_space, |
771 | task_pid_nr(current), current->comm); | 771 | task_pid_nr(current), current->comm); |
772 | force_sig_fault(SIGSEGV, SEGV_MAPERR, | 772 | force_sig_fault(SIGSEGV, SEGV_MAPERR, |
773 | (void __user *)regs->ior, current); | 773 | (void __user *)regs->ior); |
774 | return; | 774 | return; |
775 | } | 775 | } |
776 | } | 776 | } |
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index 932bfc0b7cd8..3ccc3a69469c 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c | |||
@@ -690,14 +690,14 @@ void handle_unaligned(struct pt_regs *regs) | |||
690 | if (ret == ERR_PAGEFAULT) | 690 | if (ret == ERR_PAGEFAULT) |
691 | { | 691 | { |
692 | force_sig_fault(SIGSEGV, SEGV_MAPERR, | 692 | force_sig_fault(SIGSEGV, SEGV_MAPERR, |
693 | (void __user *)regs->ior, current); | 693 | (void __user *)regs->ior); |
694 | } | 694 | } |
695 | else | 695 | else |
696 | { | 696 | { |
697 | force_sigbus: | 697 | force_sigbus: |
698 | /* couldn't handle it ... */ | 698 | /* couldn't handle it ... */ |
699 | force_sig_fault(SIGBUS, BUS_ADRALN, | 699 | force_sig_fault(SIGBUS, BUS_ADRALN, |
700 | (void __user *)regs->ior, current); | 700 | (void __user *)regs->ior); |
701 | } | 701 | } |
702 | 702 | ||
703 | return; | 703 | return; |