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
/
parisc
/
kernel
/
sys_parisc32.c
diff --git
a/arch/parisc/kernel/sys_parisc32.c
b/arch/parisc/kernel/sys_parisc32.c
index
74db7f6
..
363b8a6
100644
(file)
--- a/
arch/parisc/kernel/sys_parisc32.c
+++ b/
arch/parisc/kernel/sys_parisc32.c
@@
-80,8
+80,11
@@
asmlinkage int sys32_execve(struct pt_regs *regs)
goto out;
error = compat_do_execve(filename, compat_ptr(regs->gr[25]),
compat_ptr(regs->gr[24]), regs);
goto out;
error = compat_do_execve(filename, compat_ptr(regs->gr[25]),
compat_ptr(regs->gr[24]), regs);
- if (error == 0)
+ if (error == 0) {
+ task_lock(current);
current->ptrace &= ~PT_DTRACE;
current->ptrace &= ~PT_DTRACE;
+ task_unlock(current);
+ }
putname(filename);
out:
putname(filename);
out:
@@
-162,12
+165,6
@@
asmlinkage long sys32_sysctl(struct __sysctl_args32 *args)
return error;
}
return error;
}
-#else /* CONFIG_SYSCTL */
-
-asmlinkage long sys32_sysctl(struct __sysctl_args *args)
-{
- return -ENOSYS;
-}
#endif /* CONFIG_SYSCTL */
asmlinkage long sys32_sched_rr_get_interval(pid_t pid,
#endif /* CONFIG_SYSCTL */
asmlinkage long sys32_sched_rr_get_interval(pid_t pid,
@@
-203,21
+200,6
@@
static inline long get_ts32(struct timespec *o, struct compat_timeval *i)
return 0;
}
return 0;
}
-asmlinkage long sys32_time(compat_time_t *tloc)
-{
- struct timeval tv;
- compat_time_t now32;
-
- do_gettimeofday(&tv);
- now32 = tv.tv_sec;
-
- if (tloc)
- if (put_user(now32, tloc))
- now32 = -EFAULT;
-
- return now32;
-}
-
asmlinkage int
sys32_gettimeofday(struct compat_timeval *tv, struct timezone *tz)
{
asmlinkage int
sys32_gettimeofday(struct compat_timeval *tv, struct timezone *tz)
{