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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
sparc
/
mm
/
fault.c
diff --git
a/arch/sparc/mm/fault.c
b/arch/sparc/mm/fault.c
index
ea2a40a
..
44db335
100644
(file)
--- a/
arch/sparc/mm/fault.c
+++ b/
arch/sparc/mm/fault.c
@@
-412,10
+412,10
@@
asmlinkage void do_sun4c_fault(struct pt_regs *regs, int text_fault, int write,
address = regs->pc;
} else if (!write &&
!(regs->psr & PSR_PS)) {
address = regs->pc;
} else if (!write &&
!(regs->psr & PSR_PS)) {
- unsigned int insn, *ip;
+ unsigned int insn,
__user
*ip;
- ip = (unsigned int *)regs->pc;
- if (!
get_user(insn, ip)) {
+ ip = (unsigned int
__user
*)regs->pc;
+ if (!get_user(insn, ip)) {
if ((insn & 0xc1680000) == 0xc0680000)
write = 1;
}
if ((insn & 0xc1680000) == 0xc0680000)
write = 1;
}