Commit 08a53e34 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds

[PATCH] m32r: modify sys_ipc() to remove useless iBCS2 support code

The useless iBCS2 supporting code is removed.

However, according to old_ syscalls, I would like to keep backward-
compatibility for a while, due to some old deb packages and 
executables for m32r.
I'm struggling to rebuild and replace old packages to new ones.
http://debian.linux-m32r.org/Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 18d0b504
...@@ -227,22 +227,17 @@ asmlinkage int sys_ipc(uint call, int first, int second, ...@@ -227,22 +227,17 @@ asmlinkage int sys_ipc(uint call, int first, int second,
case MSGCTL: case MSGCTL:
return sys_msgctl (first, second, return sys_msgctl (first, second,
(struct msqid_ds __user *) ptr); (struct msqid_ds __user *) ptr);
case SHMAT: case SHMAT: {
switch (version) {
default: {
ulong raddr; ulong raddr;
ret = do_shmat (first, (char __user *) ptr,
second, &raddr); if ((ret = verify_area(VERIFY_WRITE, (ulong __user *) third,
sizeof(ulong))))
return ret;
ret = do_shmat (first, (char __user *) ptr, second, &raddr);
if (ret) if (ret)
return ret; return ret;
return put_user (raddr, (ulong __user *) third); return put_user (raddr, (ulong __user *) third);
} }
case 1: /* iBCS2 emulator entry point */
if (!segment_eq(get_fs(), get_ds()))
return -EINVAL;
return do_shmat (first, (char __user *) ptr,
second, (ulong *) third);
}
case SHMDT: case SHMDT:
return sys_shmdt ((char __user *)ptr); return sys_shmdt ((char __user *)ptr);
case SHMGET: case SHMGET:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment