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.5.x5
[linux-2.6.git]
/
arch
/
sparc
/
kernel
/
sys_sparc.c
diff --git
a/arch/sparc/kernel/sys_sparc.c
b/arch/sparc/kernel/sys_sparc.c
index
50140f4
..
4b5df5e
100644
(file)
--- a/
arch/sparc/kernel/sys_sparc.c
+++ b/
arch/sparc/kernel/sys_sparc.c
@@
-198,8
+198,7
@@
asmlinkage int sys_ipc (uint call, int first, int second, int third, void __user
goto out;
}
case 1: /* iBCS2 emulator entry point */
goto out;
}
case 1: /* iBCS2 emulator entry point */
- err = do_shmat (first, (char __user *) ptr,
- second, (ulong *) third);
+ err = -EINVAL;
goto out;
}
case SHMDT:
goto out;
}
case SHMDT:
@@
-376,7
+375,7
@@
sparc_breakpoint (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;
force_sig_info(SIGTRAP, &info, current);
info.si_trapno = 0;
force_sig_info(SIGTRAP, &info, current);