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
/
s390
/
kernel
/
sys_s390.c
diff --git
a/arch/s390/kernel/sys_s390.c
b/arch/s390/kernel/sys_s390.c
index
9ea8bec
..
efe6b83
100644
(file)
--- a/
arch/s390/kernel/sys_s390.c
+++ b/
arch/s390/kernel/sys_s390.c
@@
-145,7
+145,7
@@
asmlinkage long old_select(struct sel_arg_struct __user *arg)
*
* This is really horribly ugly.
*/
*
* This is really horribly ugly.
*/
-asmlinkage long sys_ipc(uint call, int first,
int
second,
+asmlinkage long sys_ipc(uint call, int first,
unsigned long
second,
unsigned long third, void __user *ptr)
{
struct ipc_kludge tmp;
unsigned long third, void __user *ptr)
{
struct ipc_kludge tmp;
@@
-153,24
+153,25
@@
asmlinkage long sys_ipc(uint call, int first, int second,
switch (call) {
case SEMOP:
switch (call) {
case SEMOP:
- return sys_semtimedop
(first, (struct sembuf __user *) ptr, second
,
- NULL);
+ return sys_semtimedop
(first, (struct sembuf __user *)ptr
,
+
(unsigned)second,
NULL);
case SEMTIMEDOP:
case SEMTIMEDOP:
- return sys_semtimedop (first, (struct sembuf __user *) ptr, second,
+ return sys_semtimedop(first, (struct sembuf __user *)ptr,
+ (unsigned)second,
(const struct timespec __user *) third);
case SEMGET:
(const struct timespec __user *) third);
case SEMGET:
- return sys_semget
(first,
second, third);
+ return sys_semget
(first, (int)
second, third);
case SEMCTL: {
union semun fourth;
if (!ptr)
return -EINVAL;
if (get_user(fourth.__pad, (void __user * __user *) ptr))
return -EFAULT;
case SEMCTL: {
union semun fourth;
if (!ptr)
return -EINVAL;
if (get_user(fourth.__pad, (void __user * __user *) ptr))
return -EFAULT;
- return sys_semctl
(first,
second, third, fourth);
+ return sys_semctl
(first, (int)
second, third, fourth);
}
case MSGSND:
return sys_msgsnd (first, (struct msgbuf __user *) ptr,
}
case MSGSND:
return sys_msgsnd (first, (struct msgbuf __user *) ptr,
- second, third);
+
(size_t)
second, third);
break;
case MSGRCV:
if (!ptr)
break;
case MSGRCV:
if (!ptr)
@@
-179,15
+180,17
@@
asmlinkage long sys_ipc(uint call, int first, int second,
sizeof (struct ipc_kludge)))
return -EFAULT;
return sys_msgrcv (first, tmp.msgp,
sizeof (struct ipc_kludge)))
return -EFAULT;
return sys_msgrcv (first, tmp.msgp,
- second, tmp.msgtyp, third);
+
(size_t)
second, tmp.msgtyp, third);
case MSGGET:
case MSGGET:
- return sys_msgget
((key_t) first,
second);
+ return sys_msgget
((key_t)first, (int)
second);
case MSGCTL:
case MSGCTL:
- return sys_msgctl (first, second, (struct msqid_ds __user *) ptr);
+ return sys_msgctl(first, (int)second,
+ (struct msqid_ds __user *)ptr);
case SHMAT: {
ulong raddr;
case SHMAT: {
ulong raddr;
- ret = do_shmat (first, (char __user *) ptr, second, &raddr);
+ ret = do_shmat(first, (char __user *)ptr,
+ (int)second, &raddr);
if (ret)
return ret;
return put_user (raddr, (ulong __user *) third);
if (ret)
return ret;
return put_user (raddr, (ulong __user *) third);
@@
-196,9
+199,9
@@
asmlinkage long sys_ipc(uint call, int first, int second,
case SHMDT:
return sys_shmdt ((char __user *)ptr);
case SHMGET:
case SHMDT:
return sys_shmdt ((char __user *)ptr);
case SHMGET:
- return sys_shmget
(first,
second, third);
+ return sys_shmget
(first, (size_t)
second, third);
case SHMCTL:
case SHMCTL:
- return sys_shmctl
(first,
second,
+ return sys_shmctl
(first, (int)
second,
(struct shmid_ds __user *) ptr);
default:
return -ENOSYS;
(struct shmid_ds __user *) ptr);
default:
return -ENOSYS;