aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/traps.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 13:32:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 13:32:02 -0400
commitb91cba52e9b7b3f1c0037908a192d93a869ca9e5 (patch)
treebbce7f323c8f52b308af5a152673a75b3e445360 /arch/sh/kernel/traps.c
parent98283bb49c6c8c070ebde9f47489d3e9a83c1323 (diff)
parente509ac4bbc661052dc73a2e8138800ba77d4ecb9 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (68 commits) sh: sh-rtc support for SH7709. sh: Revert __xdiv64_32 size change. sh: Update r7785rp defconfig. sh: Export div symbols for GCC 4.2 and ST GCC. sh: fix race in parallel out-of-tree build sh: Kill off dead mach.c for hp6xx. sh: hd64461.h cleanup and added comments. sh: Update the alignment when 4K stacks are used. sh: Add a .bss.page_aligned section for 4K stacks. sh: Don't let SH-4A clobber SH-4 CFLAGS. sh: Add parport stub for SuperIO ports. sh: Drop -Wa,-dsp for DSP tuning. sh: Update dreamcast defconfig. fb: pvr2fb: A few more __devinit annotations for PCI. fb: pvr2fb: Fix up section mismatch warnings. sh: Select IPR-IRQ for SH7091. sh: Correct __xdiv64_32/div64_32 return value size. sh: Fix timer-tmu build for SH-3. sh: Add cpu and mach links to CLEAN_FILES. sh: Preliminary support for the SH-X3 CPU. ...
Diffstat (limited to 'arch/sh/kernel/traps.c')
-rw-r--r--arch/sh/kernel/traps.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 09480887076b..05a40f3c30bf 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -584,7 +584,7 @@ uspace_segv:
584 info.si_signo = SIGBUS; 584 info.si_signo = SIGBUS;
585 info.si_errno = 0; 585 info.si_errno = 0;
586 info.si_code = si_code; 586 info.si_code = si_code;
587 info.si_addr = (void *) address; 587 info.si_addr = (void __user *)address;
588 force_sig_info(SIGBUS, &info, current); 588 force_sig_info(SIGBUS, &info, current);
589 } else { 589 } else {
590 if (regs->pc & 1) 590 if (regs->pc & 1)
@@ -617,7 +617,7 @@ uspace_segv:
617 */ 617 */
618int is_dsp_inst(struct pt_regs *regs) 618int is_dsp_inst(struct pt_regs *regs)
619{ 619{
620 unsigned short inst; 620 unsigned short inst = 0;
621 621
622 /* 622 /*
623 * Safe guard if DSP mode is already enabled or we're lacking 623 * Safe guard if DSP mode is already enabled or we're lacking
@@ -645,7 +645,6 @@ asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
645 unsigned long r6, unsigned long r7, 645 unsigned long r6, unsigned long r7,
646 struct pt_regs __regs) 646 struct pt_regs __regs)
647{ 647{
648 struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
649 siginfo_t info; 648 siginfo_t info;
650 649
651 switch (r4) { 650 switch (r4) {