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
/
alpha
/
mm
/
fault.c
diff --git
a/arch/alpha/mm/fault.c
b/arch/alpha/mm/fault.c
index
242317d
..
a0b969d
100644
(file)
--- a/
arch/alpha/mm/fault.c
+++ b/
arch/alpha/mm/fault.c
@@
-211,7
+211,7
@@
do_page_fault(unsigned long address, unsigned long mmcsr,
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;
force_sig_info(SIGBUS, &info, current);
if (!user_mode(regs))
goto no_context;
force_sig_info(SIGBUS, &info, current);
if (!user_mode(regs))
goto no_context;
@@
-221,7
+221,7
@@
do_page_fault(unsigned long address, unsigned long mmcsr,
info.si_signo = SIGSEGV;
info.si_errno = 0;
info.si_code = si_code;
info.si_signo = SIGSEGV;
info.si_errno = 0;
info.si_code = si_code;
- info.si_addr = (void *) address;
+ info.si_addr = (void
__user
*) address;
force_sig_info(SIGSEGV, &info, current);
return;
force_sig_info(SIGSEGV, &info, current);
return;