projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
alpha
/
kernel
/
traps.c
diff --git
a/arch/alpha/kernel/traps.c
b/arch/alpha/kernel/traps.c
index
5398f98
..
e805106
100644
(file)
--- a/
arch/alpha/kernel/traps.c
+++ b/
arch/alpha/kernel/traps.c
@@
-227,7
+227,7
@@
do_entArith(unsigned long summary, unsigned long write_mask,
}
die_if_kernel("Arithmetic fault", regs, 0, NULL);
}
die_if_kernel("Arithmetic fault", regs, 0, NULL);
- send_sig_fault(SIGFPE, si_code, (void __user *) regs->pc, 0, current);
+ send_sig_fault
_trapno
(SIGFPE, si_code, (void __user *) regs->pc, 0, current);
}
asmlinkage void
}
asmlinkage void
@@
-268,13
+268,13
@@
do_entIF(unsigned long type, struct pt_regs *regs)
regs->pc -= 4; /* make pc point to former bpt */
}
regs->pc -= 4; /* make pc point to former bpt */
}
- send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc,
0,
+ send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc,
current);
return;
case 1: /* bugcheck */
current);
return;
case 1: /* bugcheck */
- send_sig_fault
(SIGTRAP, TRAP_UNK, (void __user *) regs->pc, 0
,
- current);
+ send_sig_fault
_trapno(SIGTRAP, TRAP_UNK
,
+
(void __user *) regs->pc, 0,
current);
return;
case 2: /* gentrap */
return;
case 2: /* gentrap */
@@
-335,8
+335,8
@@
do_entIF(unsigned long type, struct pt_regs *regs)
break;
}
break;
}
- send_sig_fault
(signo, code, (void __user *) regs->pc, regs->r16
,
- current);
+ send_sig_fault
_trapno(signo, code, (void __user *) regs->pc
,
+
regs->r16,
current);
return;
case 4: /* opDEC */
return;
case 4: /* opDEC */
@@
-360,9
+360,9
@@
do_entIF(unsigned long type, struct pt_regs *regs)
if (si_code == 0)
return;
if (si_code > 0) {
if (si_code == 0)
return;
if (si_code > 0) {
- send_sig_fault(SIGFPE, si_code,
-
(void __user *) regs->pc, 0
,
- current);
+ send_sig_fault
_trapno
(SIGFPE, si_code,
+
(void __user *) regs->pc
,
+
0,
current);
return;
}
}
return;
}
}
@@
-387,7
+387,7
@@
do_entIF(unsigned long type, struct pt_regs *regs)
;
}
;
}
- send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc,
0,
current);
+ send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc, current);
}
/* There is an ifdef in the PALcode in MILO that enables a
}
/* There is an ifdef in the PALcode in MILO that enables a
@@
-402,7
+402,7
@@
do_entDbg(struct pt_regs *regs)
{
die_if_kernel("Instruction fault", regs, 0, NULL);
{
die_if_kernel("Instruction fault", regs, 0, NULL);
- force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc
, 0
);
+ force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc);
}
}
@@
-964,12
+964,12
@@
give_sigsegv:
si_code = SEGV_MAPERR;
mmap_read_unlock(mm);
}
si_code = SEGV_MAPERR;
mmap_read_unlock(mm);
}
- send_sig_fault(SIGSEGV, si_code, va,
0,
current);
+ send_sig_fault(SIGSEGV, si_code, va, current);
return;
give_sigbus:
regs->pc -= 4;
return;
give_sigbus:
regs->pc -= 4;
- send_sig_fault(SIGBUS, BUS_ADRALN, va,
0,
current);
+ send_sig_fault(SIGBUS, BUS_ADRALN, va, current);
return;
}
return;
}