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.3
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
sys_arm.c
diff --git
a/arch/arm/kernel/sys_arm.c
b/arch/arm/kernel/sys_arm.c
index
fb26b3b
..
7cbd18e
100644
(file)
--- a/
arch/arm/kernel/sys_arm.c
+++ b/
arch/arm/kernel/sys_arm.c
@@
-217,11
+217,8
@@
asmlinkage int sys_ipc(uint call, int first, int second, int third,
return ret;
return put_user(raddr, (ulong __user *)third);
}
return ret;
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 __user *) third);
+ case 1: /* Of course, we don't support iBCS2! */
+ return -EINVAL;
}
case SHMDT:
return sys_shmdt ((char __user *)ptr);
}
case SHMDT:
return sys_shmdt ((char __user *)ptr);
@@
-257,7
+254,7
@@
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, struct
if (!newsp)
newsp = regs->ARM_sp;
if (!newsp)
newsp = regs->ARM_sp;
- return do_fork(clone_flags
& ~CLONE_IDLETASK
, newsp, regs, 0, NULL, NULL);
+ return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
}
asmlinkage int sys_vfork(struct pt_regs *regs)
}
asmlinkage int sys_vfork(struct pt_regs *regs)