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
/
ppc64
/
kernel
/
syscalls.c
diff --git
a/arch/ppc64/kernel/syscalls.c
b/arch/ppc64/kernel/syscalls.c
index
00ff653
..
4ae0825
100644
(file)
--- a/
arch/ppc64/kernel/syscalls.c
+++ b/
arch/ppc64/kernel/syscalls.c
@@
-57,7
+57,7
@@
check_bugs(void)
* This is really horribly ugly.
*/
asmlinkage int
* This is really horribly ugly.
*/
asmlinkage int
-sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
+sys_ipc (uint call, int first, int second, long third, void
__user
*ptr, long fifth)
{
int version, ret;
{
int version, ret;
@@
-67,12
+67,12
@@
sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
ret = -ENOSYS;
switch (call) {
case SEMOP:
ret = -ENOSYS;
switch (call) {
case SEMOP:
- ret = sys_semtimedop (first, (struct sembuf *)ptr, second,
+ ret = sys_semtimedop (first, (struct sembuf
__user
*)ptr, second,
NULL);
break;
case SEMTIMEDOP:
NULL);
break;
case SEMTIMEDOP:
- ret = sys_semtimedop (first, (struct sembuf *)ptr, second,
- (const struct timespec *) fifth);
+ ret = sys_semtimedop (first, (struct sembuf
__user
*)ptr, second,
+ (const struct timespec
__user
*) fifth);
break;
case SEMGET:
ret = sys_semget (first, second, third);
break;
case SEMGET:
ret = sys_semget (first, second, third);
@@
-83,13
+83,13
@@
sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
ret = -EINVAL;
if (!ptr)
break;
ret = -EINVAL;
if (!ptr)
break;
- if ((ret = get_user(fourth.__pad, (void
*
*)ptr)))
+ if ((ret = get_user(fourth.__pad, (void
__user * __user
*)ptr)))
break;
ret = sys_semctl (first, second, third, fourth);
break;
}
case MSGSND:
break;
ret = sys_semctl (first, second, third, fourth);
break;
}
case MSGSND:
- ret = sys_msgsnd (first, (struct msgbuf *) ptr, second, third);
+ ret = sys_msgsnd (first, (struct msgbuf
__user
*) ptr, second, third);
break;
case MSGRCV:
switch (version) {
break;
case MSGRCV:
switch (version) {
@@
-100,7
+100,7
@@
sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
if (!ptr)
break;
if ((ret = copy_from_user(&tmp,
if (!ptr)
break;
if ((ret = copy_from_user(&tmp,
- (struct ipc_kludge *) ptr,
+ (struct ipc_kludge
__user
*) ptr,
sizeof (tmp)) ? -EFAULT : 0))
break;
ret = sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp,
sizeof (tmp)) ? -EFAULT : 0))
break;
ret = sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp,
@@
-108,7
+108,7
@@
sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
break;
}
default:
break;
}
default:
- ret = sys_msgrcv (first, (struct msgbuf *) ptr,
+ ret = sys_msgrcv (first, (struct msgbuf
__user
*) ptr,
second, fifth, third);
break;
}
second, fifth, third);
break;
}
@@
-117,35
+117,35
@@
sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
ret = sys_msgget ((key_t) first, second);
break;
case MSGCTL:
ret = sys_msgget ((key_t) first, second);
break;
case MSGCTL:
- ret = sys_msgctl (first, second, (struct msqid_ds *) ptr);
+ ret = sys_msgctl (first, second, (struct msqid_ds
__user
*) ptr);
break;
case SHMAT:
switch (version) {
default: {
ulong raddr;
break;
case SHMAT:
switch (version) {
default: {
ulong raddr;
- ret = do_shmat (first, (char *) ptr, second, &raddr);
+ ret = do_shmat (first, (char
__user
*) ptr, second, &raddr);
if (ret)
break;
if (ret)
break;
- ret = put_user (raddr, (ulong *) third);
+ ret = put_user (raddr, (ulong
__user
*) third);
break;
}
case 1: /* iBCS2 emulator entry point */
ret = -EINVAL;
if (!segment_eq(get_fs(), get_ds()))
break;
break;
}
case 1: /* iBCS2 emulator entry point */
ret = -EINVAL;
if (!segment_eq(get_fs(), get_ds()))
break;
- ret = do_shmat (first, (char *) ptr, second,
+ ret = do_shmat (first, (char
__user
*) ptr, second,
(ulong *) third);
break;
}
break;
case SHMDT:
(ulong *) third);
break;
}
break;
case SHMDT:
- ret = sys_shmdt ((char *)ptr);
+ ret = sys_shmdt ((char
__user
*)ptr);
break;
case SHMGET:
ret = sys_shmget (first, second, third);
break;
case SHMCTL:
break;
case SHMGET:
ret = sys_shmget (first, second, third);
break;
case SHMCTL:
- ret = sys_shmctl (first, second, (struct shmid_ds *) ptr);
+ ret = sys_shmctl (first, second, (struct shmid_ds
__user
*) ptr);
break;
}
break;
}
@@
-156,7
+156,7
@@
sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth)
* sys_pipe() is the normal C calling standard for creating
* a pipe. It's not the way unix traditionally does this, though.
*/
* sys_pipe() is the normal C calling standard for creating
* a pipe. It's not the way unix traditionally does this, though.
*/
-asmlinkage int sys_pipe(int *fildes)
+asmlinkage int sys_pipe(int
__user
*fildes)
{
int fd[2];
int error;
{
int fd[2];
int error;
@@
-202,7
+202,7
@@
static int __init set_fakeppc(char *str)
}
__setup("fakeppc", set_fakeppc);
}
__setup("fakeppc", set_fakeppc);
-asmlinkage int sys_uname(struct old_utsname * name)
+asmlinkage int sys_uname(struct old_utsname
__user
* name)
{
int err = -EFAULT;
{
int err = -EFAULT;
@@
-214,7
+214,7
@@
asmlinkage int sys_uname(struct old_utsname * name)
return err;
}
return err;
}
-asmlinkage time_t sys64_time(time_t* tloc)
+asmlinkage time_t sys64_time(time_t
__user
* tloc)
{
time_t secs;
time_t usecs;
{
time_t secs;
time_t usecs;