Merge branch 'linus' into timers/2038

[linux-2.6-microblaze.git] / kernel / time / posix-stubs.c

diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index 69a937c..26aa956 100644 (file)
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -59,7 +59,7 @@ SYS_NI(alarm);
  */
 
 SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
-               const struct timespec __user *, tp)
+               const struct __kernel_timespec __user *, tp)
 {
        struct timespec64 new_tp;
 
@@ -90,7 +90,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)
        return 0;
 }
 SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
-               struct timespec __user *, tp)
+               struct __kernel_timespec __user *, tp)
 {
        int ret;
        struct timespec64 kernel_tp;
@@ -104,7 +104,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
        return 0;
 }
 
-SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct timespec __user *, tp)
+SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_timespec __user *, tp)
 {
        struct timespec64 rtn_tp = {
                .tv_sec = 0,
@@ -124,8 +124,8 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct timespec __us
 }
 
 SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
-               const struct timespec __user *, rqtp,
-               struct timespec __user *, rmtp)
+               const struct __kernel_timespec __user *, rqtp,
+               struct __kernel_timespec __user *, rmtp)
 {
        struct timespec64 t;
 
@@ -158,7 +158,9 @@ COMPAT_SYS_NI(timer_settime);
 COMPAT_SYS_NI(timer_gettime);
 COMPAT_SYS_NI(getitimer);
 COMPAT_SYS_NI(setitimer);
+#endif
 
+#ifdef CONFIG_COMPAT_32BIT_TIME
 COMPAT_SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
                       struct compat_timespec __user *, tp)
 {