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
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
signal.c
diff --git
a/arch/alpha/kernel/signal.c
b/arch/alpha/kernel/signal.c
index
d908d77
..
0797b46
100644
(file)
--- a/
arch/alpha/kernel/signal.c
+++ b/
arch/alpha/kernel/signal.c
@@
-304,7
+304,7
@@
do_sigreturn(struct sigcontext __user *sc, struct pt_regs *regs,
info.si_signo = SIGTRAP;
info.si_errno = 0;
info.si_code = TRAP_BRKPT;
info.si_signo = SIGTRAP;
info.si_errno = 0;
info.si_code = TRAP_BRKPT;
- info.si_addr = (void *) regs->pc;
+ info.si_addr = (void
__user
*) regs->pc;
info.si_trapno = 0;
send_sig_info(SIGTRAP, &info, current);
}
info.si_trapno = 0;
send_sig_info(SIGTRAP, &info, current);
}
@@
-342,7
+342,7
@@
do_rt_sigreturn(struct rt_sigframe __user *frame, struct pt_regs *regs,
info.si_signo = SIGTRAP;
info.si_errno = 0;
info.si_code = TRAP_BRKPT;
info.si_signo = SIGTRAP;
info.si_errno = 0;
info.si_code = TRAP_BRKPT;
- info.si_addr = (void *) regs->pc;
+ info.si_addr = (void
__user
*) regs->pc;
info.si_trapno = 0;
send_sig_info(SIGTRAP, &info, current);
}
info.si_trapno = 0;
send_sig_info(SIGTRAP, &info, current);
}