git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
sparc
/
mm
/
fault.c
diff --git
a/arch/sparc/mm/fault.c
b/arch/sparc/mm/fault.c
index
cc857f6
..
dde63e1
100644
(file)
--- a/
arch/sparc/mm/fault.c
+++ b/
arch/sparc/mm/fault.c
@@
-326,7
+326,7
@@
bad_area_nosemaphore:
info.si_errno = 0;
/* info.si_code set above to make clear whether
this was a SEGV_MAPERR or SEGV_ACCERR fault. */
info.si_errno = 0;
/* info.si_code set above to make clear whether
this was a SEGV_MAPERR or SEGV_ACCERR fault. */
- info.si_addr = (void
*)
compute_si_addr(regs, text_fault);
+ info.si_addr = (void
__user *)
compute_si_addr(regs, text_fault);
info.si_trapno = 0;
force_sig_info (SIGSEGV, &info, tsk);
return;
info.si_trapno = 0;
force_sig_info (SIGSEGV, &info, tsk);
return;
@@
-380,7
+380,7
@@
do_sigbus:
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRERR;
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRERR;
- info.si_addr = (void *) compute_si_addr(regs, text_fault);
+ info.si_addr = (void
__user
*) compute_si_addr(regs, text_fault);
info.si_trapno = 0;
force_sig_info (SIGBUS, &info, tsk);
if (!from_user)
info.si_trapno = 0;
force_sig_info (SIGBUS, &info, tsk);
if (!from_user)
@@
-549,7
+549,7
@@
bad_area:
info.si_errno = 0;
/* info.si_code set above to make clear whether
this was a SEGV_MAPERR or SEGV_ACCERR fault. */
info.si_errno = 0;
/* info.si_code set above to make clear whether
this was a SEGV_MAPERR or SEGV_ACCERR fault. */
- info.si_addr = (void *) address;
+ info.si_addr = (void
__user
*) address;
info.si_trapno = 0;
force_sig_info (SIGSEGV, &info, tsk);
return;
info.si_trapno = 0;
force_sig_info (SIGSEGV, &info, tsk);
return;
@@
-559,7
+559,7
@@
do_sigbus:
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRERR;
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRERR;
- info.si_addr = (void *) address;
+ info.si_addr = (void
__user
*) address;
info.si_trapno = 0;
force_sig_info (SIGBUS, &info, tsk);
}
info.si_trapno = 0;
force_sig_info (SIGBUS, &info, tsk);
}