git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...
[sfrench/cifs-2.6.git]
/
arch
/
openrisc
/
mm
/
fault.c
diff --git
a/arch/openrisc/mm/fault.c
b/arch/openrisc/mm/fault.c
index 9eee5bf3db27a2da698519c258e62a2b00a52571..5d4d3a9691d0fb32d3bbcd8041e05bf4fa06c5f2 100644
(file)
--- a/
arch/openrisc/mm/fault.c
+++ b/
arch/openrisc/mm/fault.c
@@
-209,7
+209,7
@@
bad_area_nosemaphore:
/* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) {
/* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) {
- force_sig_fault(SIGSEGV, si_code, (void __user *)address
, tsk
);
+ force_sig_fault(SIGSEGV, si_code, (void __user *)address);
return;
}
return;
}
@@
-274,7
+274,7
@@
do_sigbus:
* Send a sigbus, regardless of whether we were in kernel
* or user mode.
*/
* Send a sigbus, regardless of whether we were in kernel
* or user mode.
*/
- force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address
, tsk
);
+ force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs))
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs))