diff --git a/[refs] b/[refs] index 606c7d65704d..85fe2ca63f63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af9379c7121d5543722c00bbd1adf7dcaa0b6448 +refs/heads/master: e3d5a27d5862b6425d0879272e24abecf7245105 diff --git a/trunk/kernel/compat.c b/trunk/kernel/compat.c index d52e2ec1deb5..42d56544460f 100644 --- a/trunk/kernel/compat.c +++ b/trunk/kernel/compat.c @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -229,6 +230,7 @@ asmlinkage long compat_sys_times(struct compat_tms __user *tbuf) if (copy_to_user(tbuf, &tmp, sizeof(tmp))) return -EFAULT; } + force_successful_syscall_return(); return compat_jiffies_to_clock_t(jiffies); } @@ -894,8 +896,9 @@ asmlinkage long compat_sys_time(compat_time_t __user * tloc) if (tloc) { if (put_user(i,tloc)) - i = -EFAULT; + return -EFAULT; } + force_successful_syscall_return(); return i; } diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c index d356d79e84ac..4a43617cd565 100644 --- a/trunk/kernel/sys.c +++ b/trunk/kernel/sys.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -927,6 +928,7 @@ asmlinkage long sys_times(struct tms __user * tbuf) if (copy_to_user(tbuf, &tmp, sizeof(struct tms))) return -EFAULT; } + force_successful_syscall_return(); return (long) jiffies_64_to_clock_t(get_jiffies_64()); } diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c index d63a4336fad6..4886e3ce83a4 100644 --- a/trunk/kernel/time.c +++ b/trunk/kernel/time.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -65,8 +66,9 @@ asmlinkage long sys_time(time_t __user * tloc) if (tloc) { if (put_user(i,tloc)) - i = -EFAULT; + return -EFAULT; } + force_successful_syscall_return(); return i; }