From: Arnd Bergmann <arnd@arndb.de>
To: y2038@lists.linaro.org, Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Deepa Dinamani <deepa.kernel@gmail.com>,
Christian Brauner <christian@brauner.io>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Anna-Maria Gleixner <anna-maria@linutronix.de>,
linux-alpha@vger.kernel.org
Subject: [PATCH 19/23] y2038: use compat_{get,set}_itimer on alpha
Date: Fri, 8 Nov 2019 22:12:18 +0100 [thread overview]
Message-ID: <20191108211323.1806194-10-arnd@arndb.de> (raw)
In-Reply-To: <20191108210236.1296047-1-arnd@arndb.de>
The itimer handling for the old alpha osf_setitimer/osf_getitimer
system calls is identical to the compat version of getitimer/setitimer,
so just use those directly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/kernel/osf_sys.c | 65 --------------------------
arch/alpha/kernel/syscalls/syscall.tbl | 4 +-
kernel/time/itimer.c | 4 +-
3 files changed, 4 insertions(+), 69 deletions(-)
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index bbe7a0da6264..94e4cde8071a 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -971,30 +971,6 @@ put_tv_to_tv32(struct timeval32 __user *o, struct __kernel_old_timeval *i)
sizeof(struct timeval32));
}
-static inline long
-get_it32(struct itimerval *o, struct itimerval32 __user *i)
-{
- struct itimerval32 itv;
- if (copy_from_user(&itv, i, sizeof(struct itimerval32)))
- return -EFAULT;
- o->it_interval.tv_sec = itv.it_interval.tv_sec;
- o->it_interval.tv_usec = itv.it_interval.tv_usec;
- o->it_value.tv_sec = itv.it_value.tv_sec;
- o->it_value.tv_usec = itv.it_value.tv_usec;
- return 0;
-}
-
-static inline long
-put_it32(struct itimerval32 __user *o, struct itimerval *i)
-{
- return copy_to_user(o, &(struct itimerval32){
- .it_interval.tv_sec = o->it_interval.tv_sec,
- .it_interval.tv_usec = o->it_interval.tv_usec,
- .it_value.tv_sec = o->it_value.tv_sec,
- .it_value.tv_usec = o->it_value.tv_usec},
- sizeof(struct itimerval32));
-}
-
static inline void
jiffies_to_timeval32(unsigned long jiffies, struct timeval32 *value)
{
@@ -1039,47 +1015,6 @@ SYSCALL_DEFINE2(osf_settimeofday, struct timeval32 __user *, tv,
asmlinkage long sys_ni_posix_timers(void);
-SYSCALL_DEFINE2(osf_getitimer, int, which, struct itimerval32 __user *, it)
-{
- struct itimerval kit;
- int error;
-
- if (!IS_ENABLED(CONFIG_POSIX_TIMERS))
- return sys_ni_posix_timers();
-
- error = do_getitimer(which, &kit);
- if (!error && put_it32(it, &kit))
- error = -EFAULT;
-
- return error;
-}
-
-SYSCALL_DEFINE3(osf_setitimer, int, which, struct itimerval32 __user *, in,
- struct itimerval32 __user *, out)
-{
- struct itimerval kin, kout;
- int error;
-
- if (!IS_ENABLED(CONFIG_POSIX_TIMERS))
- return sys_ni_posix_timers();
-
- if (in) {
- if (get_it32(&kin, in))
- return -EFAULT;
- } else
- memset(&kin, 0, sizeof(kin));
-
- error = do_setitimer(which, &kin, out ? &kout : NULL);
- if (error || !out)
- return error;
-
- if (put_it32(out, &kout))
- return -EFAULT;
-
- return 0;
-
-}
-
SYSCALL_DEFINE2(osf_utimes, const char __user *, filename,
struct timeval32 __user *, tvs)
{
diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index 728fe028c02c..8e13b0b2928d 100644
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@ -89,10 +89,10 @@
80 common setgroups sys_setgroups
81 common osf_old_getpgrp sys_ni_syscall
82 common setpgrp sys_setpgid
-83 common osf_setitimer sys_osf_setitimer
+83 common osf_setitimer compat_sys_setitimer
84 common osf_old_wait sys_ni_syscall
85 common osf_table sys_ni_syscall
-86 common osf_getitimer sys_osf_getitimer
+86 common osf_getitimer compat_sys_getitimer
87 common gethostname sys_gethostname
88 common sethostname sys_sethostname
89 common getdtablesize sys_getdtablesize
diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index c52ebb40b60b..4664c6addf69 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -111,7 +111,7 @@ SYSCALL_DEFINE2(getitimer, int, which, struct itimerval __user *, value)
return error;
}
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA)
struct old_itimerval32 {
struct old_timeval32 it_interval;
struct old_timeval32 it_value;
@@ -324,7 +324,7 @@ SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value,
return 0;
}
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA)
static int get_old_itimerval32(struct itimerval *o, const struct old_itimerval32 __user *i)
{
struct old_itimerval32 v32;
--
2.20.0
next prev parent reply other threads:[~2019-11-08 21:17 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 21:02 [PATCH 00/23] y2038 cleanups Arnd Bergmann
2019-11-08 21:02 ` Arnd Bergmann
2019-11-08 21:02 ` Arnd Bergmann
2019-11-08 21:02 ` Arnd Bergmann
2019-11-08 21:02 ` Arnd Bergmann
2019-11-08 21:02 ` Arnd Bergmann
2019-11-08 21:02 ` Arnd Bergmann
2019-11-08 21:07 ` [PATCH 01/23] y2038: remove CONFIG_64BIT_TIME Arnd Bergmann
2019-11-20 22:28 ` [Y2038] " Ben Hutchings
2019-11-20 22:58 ` Dmitry Safonov
2019-11-08 21:07 ` [PATCH 02/23] y2038: add __kernel_old_timespec and __kernel_old_time_t Arnd Bergmann
2019-11-09 19:02 ` Deepa Dinamani
2019-11-20 22:30 ` [Y2038] " Ben Hutchings
2019-11-21 14:17 ` Arnd Bergmann
2019-11-08 21:07 ` [PATCH 03/23] y2038: vdso: change timeval to __kernel_old_timeval Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-13 21:56 ` Thomas Gleixner
2019-11-13 21:56 ` Thomas Gleixner
2019-11-13 21:56 ` Thomas Gleixner
2019-11-13 21:56 ` Thomas Gleixner
2019-11-08 21:07 ` [PATCH 04/23] y2038: vdso: change timespec to __kernel_old_timespec Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:07 ` [PATCH 05/23] y2038: vdso: change time_t to __kernel_old_time_t Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-13 21:57 ` Thomas Gleixner
2019-11-13 21:57 ` Thomas Gleixner
2019-11-08 21:07 ` [PATCH 06/23] y2038: vdso: nds32: open-code timespec_add_ns() Arnd Bergmann
2019-11-08 21:07 ` [PATCH 07/23] y2038: vdso: powerpc: avoid timespec references Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-20 22:43 ` [Y2038] " Ben Hutchings
2019-11-20 22:43 ` Ben Hutchings
2019-11-21 14:23 ` Arnd Bergmann
2019-11-21 14:23 ` Arnd Bergmann
2019-11-21 16:25 ` Christophe Leroy
2019-11-21 16:25 ` Christophe Leroy
2019-11-27 11:03 ` Arnd Bergmann
2019-11-27 11:03 ` Arnd Bergmann
2019-12-02 12:55 ` Christophe Leroy
2019-12-02 12:55 ` Christophe Leroy
2019-12-02 14:03 ` Arnd Bergmann
2019-12-02 14:03 ` Arnd Bergmann
2019-11-08 21:07 ` [PATCH 08/23] y2038: ipc: remove __kernel_time_t reference from headers Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-20 22:49 ` [Y2038] " Ben Hutchings
2019-11-20 22:49 ` Ben Hutchings
2019-11-20 22:49 ` Ben Hutchings
2019-11-21 14:28 ` [Y2038] " Arnd Bergmann
2019-11-21 14:28 ` Arnd Bergmann
2019-11-21 14:28 ` Arnd Bergmann
2019-11-21 14:28 ` Arnd Bergmann
2019-11-08 21:07 ` [PATCH 09/23] y2038: stat: avoid 'time_t' in 'struct stat' Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:07 ` Arnd Bergmann
2019-11-08 21:12 ` [PATCH 10/23] y2038: uapi: change __kernel_time_t to __kernel_old_time_t Arnd Bergmann
2019-11-09 19:03 ` Deepa Dinamani
2019-11-11 12:38 ` Christian Brauner
2019-11-08 21:12 ` [PATCH 11/23] y2038: rusage: use __kernel_old_timeval Arnd Bergmann
2019-11-12 21:09 ` Cyrill Gorcunov
2019-11-13 10:02 ` Arnd Bergmann
2019-11-13 17:22 ` Cyrill Gorcunov
2019-11-14 0:38 ` Christian Brauner
2019-11-14 0:38 ` Christian Brauner
2019-11-14 10:18 ` Arnd Bergmann
2019-11-14 10:23 ` Christian Brauner
2019-11-08 21:12 ` [PATCH 12/23] y2038: syscalls: change remaining timeval to __kernel_old_timeval Arnd Bergmann
2019-11-08 21:12 ` Arnd Bergmann
2019-11-11 12:44 ` Christian Brauner
2019-11-11 12:44 ` Christian Brauner
2019-11-11 12:44 ` Christian Brauner
2019-11-13 22:39 ` Rafael J. Wysocki
2019-11-13 22:39 ` Rafael J. Wysocki
2019-11-08 21:12 ` [PATCH 13/23] y2038: socket: remove timespec reference in timestamping Arnd Bergmann
2019-11-09 19:03 ` Deepa Dinamani
2019-11-11 20:24 ` Arnd Bergmann
2019-11-08 21:12 ` [PATCH 14/23] y2038: make ns_to_compat_timeval use __kernel_old_timeval Arnd Bergmann
2019-11-08 21:12 ` [PATCH 15/23] y2038: elfcore: Use __kernel_old_timeval for process times Arnd Bergmann
2019-11-08 21:12 ` [PATCH 16/23] y2038: timerfd: Use timespec64 internally Arnd Bergmann
2019-11-13 21:49 ` Thomas Gleixner
2019-11-08 21:12 ` [PATCH 17/23] y2038: time: avoid timespec usage in settimeofday() Arnd Bergmann
2019-11-13 21:53 ` Thomas Gleixner
2019-11-14 11:06 ` Arnd Bergmann
2019-11-14 11:06 ` Arnd Bergmann
2019-11-14 14:04 ` Thomas Gleixner
2019-11-14 14:04 ` Thomas Gleixner
2019-11-14 14:35 ` Arnd Bergmann
2019-11-14 23:01 ` Abel Vesa
2019-11-15 7:58 ` Arnd Bergmann
2019-11-15 10:27 ` Rasmus Villemoes
2019-11-15 13:50 ` Arnd Bergmann
2019-11-08 21:12 ` [PATCH 18/23] y2038: itimer: compat handling to itimer.c Arnd Bergmann
2019-11-13 21:54 ` Thomas Gleixner
2019-11-08 21:12 ` Arnd Bergmann [this message]
2019-12-02 13:13 ` [PATCH 19/23] y2038: use compat_{get,set}_itimer on alpha Guenter Roeck
2019-11-08 21:12 ` [PATCH 20/23] y2038: move itimer reset into itimer.c Arnd Bergmann
2019-11-09 13:43 ` Ondrej Mosnacek
2019-11-09 21:02 ` Arnd Bergmann
2019-11-09 23:07 ` Ondrej Mosnacek
2019-11-11 10:57 ` Arnd Bergmann
2019-11-14 8:51 ` Ondrej Mosnacek
2019-11-14 10:51 ` Thomas Gleixner
2019-11-13 22:03 ` Thomas Gleixner
2019-11-08 21:12 ` [PATCH 21/23] y2038: itimer: change implementation to timespec64 Arnd Bergmann
2019-11-13 22:28 ` Thomas Gleixner
2019-11-14 2:06 ` Steven Rostedt
2019-11-14 10:48 ` Thomas Gleixner
2019-11-14 10:52 ` Arnd Bergmann
2019-11-14 10:51 ` Arnd Bergmann
2019-11-14 10:57 ` Thomas Gleixner
2019-11-21 16:52 ` [Y2038] " Ben Hutchings
2019-11-25 20:26 ` Arnd Bergmann
2019-11-08 21:12 ` [PATCH 22/23] [RFC] y2038: itimer: use ktime_t internally Arnd Bergmann
2019-11-13 22:30 ` Thomas Gleixner
2019-11-08 21:12 ` [PATCH 23/23] y2038: allow disabling time32 system calls Arnd Bergmann
2019-11-11 12:31 ` Christian Brauner
2019-11-13 21:40 ` [PATCH 00/23] y2038 cleanups Arnd Bergmann
2019-11-13 21:40 ` Arnd Bergmann
2019-11-13 21:40 ` Arnd Bergmann
2019-11-13 21:40 ` Arnd Bergmann
2019-11-13 21:40 ` Arnd Bergmann
2019-11-13 21:40 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191108211323.1806194-10-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=anna-maria@linutronix.de \
--cc=christian@brauner.io \
--cc=deepa.kernel@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=rth@twiddle.net \
--cc=tglx@linutronix.de \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.