Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79720
b: refs/heads/master
c: 2da06b4
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner authored and Ingo Molnar committed Jan 30, 2008
1 parent 600c51f commit 3517ee9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 99b9cdf758af7004a716cf304dd5cd41af7db227
refs/heads/master: 2da06b4e5da96fff4f07cc35af1db407e1e21aa7
30 changes: 14 additions & 16 deletions trunk/arch/x86/ia32/ipc32.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,44 @@
#include <linux/ipc.h>
#include <linux/compat.h>

asmlinkage long
sys32_ipc(u32 call, int first, int second, int third,
compat_uptr_t ptr, u32 fifth)
asmlinkage long sys32_ipc(u32 call, int first, int second, int third,
compat_uptr_t ptr, u32 fifth)
{
int version;

version = call >> 16; /* hack for backward compatibility */
call &= 0xffff;

switch (call) {
case SEMOP:
case SEMOP:
/* struct sembuf is the same on 32 and 64bit :)) */
return sys_semtimedop(first, compat_ptr(ptr), second, NULL);
case SEMTIMEDOP:
case SEMTIMEDOP:
return compat_sys_semtimedop(first, compat_ptr(ptr), second,
compat_ptr(fifth));
case SEMGET:
case SEMGET:
return sys_semget(first, second, third);
case SEMCTL:
case SEMCTL:
return compat_sys_semctl(first, second, third, compat_ptr(ptr));

case MSGSND:
case MSGSND:
return compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
case MSGRCV:
case MSGRCV:
return compat_sys_msgrcv(first, second, fifth, third,
version, compat_ptr(ptr));
case MSGGET:
case MSGGET:
return sys_msgget((key_t) first, second);
case MSGCTL:
case MSGCTL:
return compat_sys_msgctl(first, second, compat_ptr(ptr));

case SHMAT:
case SHMAT:
return compat_sys_shmat(first, second, third, version,
compat_ptr(ptr));
break;
case SHMDT:
case SHMDT:
return sys_shmdt(compat_ptr(ptr));
case SHMGET:
case SHMGET:
return sys_shmget(first, (unsigned)second, third);
case SHMCTL:
case SHMCTL:
return compat_sys_shmctl(first, second, compat_ptr(ptr));
}
return -ENOSYS;
Expand Down

0 comments on commit 3517ee9

Please sign in to comment.