|
@@ -743,7 +743,7 @@ static int do_timer_gettime(timer_t timer_id, struct itimerspec64 *setting)
|
|
|
|
|
|
/* Get the time remaining on a POSIX.1b interval timer. */
|
|
/* Get the time remaining on a POSIX.1b interval timer. */
|
|
SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
|
|
SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
|
|
- struct itimerspec __user *, setting)
|
|
|
|
|
|
+ struct __kernel_itimerspec __user *, setting)
|
|
{
|
|
{
|
|
struct itimerspec64 cur_setting;
|
|
struct itimerspec64 cur_setting;
|
|
|
|
|
|
@@ -755,7 +755,8 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_COMPAT
|
|
|
|
|
|
+#ifdef CONFIG_COMPAT_32BIT_TIME
|
|
|
|
+
|
|
COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
|
|
COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
|
|
struct compat_itimerspec __user *, setting)
|
|
struct compat_itimerspec __user *, setting)
|
|
{
|
|
{
|
|
@@ -768,6 +769,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
|
|
}
|
|
}
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
+
|
|
#endif
|
|
#endif
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -906,8 +908,8 @@ retry:
|
|
|
|
|
|
/* Set a POSIX.1b interval timer */
|
|
/* Set a POSIX.1b interval timer */
|
|
SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
|
|
SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
|
|
- const struct itimerspec __user *, new_setting,
|
|
|
|
- struct itimerspec __user *, old_setting)
|
|
|
|
|
|
+ const struct __kernel_itimerspec __user *, new_setting,
|
|
|
|
+ struct __kernel_itimerspec __user *, old_setting)
|
|
{
|
|
{
|
|
struct itimerspec64 new_spec, old_spec;
|
|
struct itimerspec64 new_spec, old_spec;
|
|
struct itimerspec64 *rtn = old_setting ? &old_spec : NULL;
|
|
struct itimerspec64 *rtn = old_setting ? &old_spec : NULL;
|
|
@@ -927,7 +929,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_COMPAT
|
|
|
|
|
|
+#ifdef CONFIG_COMPAT_32BIT_TIME
|
|
COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
|
|
COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
|
|
struct compat_itimerspec __user *, new,
|
|
struct compat_itimerspec __user *, new,
|
|
struct compat_itimerspec __user *, old)
|
|
struct compat_itimerspec __user *, old)
|