From: Fino Meng <fino.meng@linux.intel.com>
To: xenomai@xenomai.org
Subject: [PATCH 2/4] cobalt/kernel: adapt adjtime syscall with upstream kernel
Date: Fri, 18 Sep 2020 00:55:08 +0800 [thread overview]
Message-ID: <20200917165504.GA6203@linux.intel.com> (raw)
compat_timex related definitions moved from compat code into normal timekeeping code.
see 4d5f007e in upstream Linux kernel.
Signed-off-by: Fino Meng <fino.meng@linux.intel.com>
Signed-off-by: Mingliang Hu <mingliang.hu@intel.com>
---
include/cobalt/kernel/compat.h | 4 ++--
kernel/cobalt/posix/compat.c | 4 ++--
kernel/cobalt/posix/syscall32.c | 2 +-
kernel/cobalt/posix/syscall32.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/cobalt/kernel/compat.h b/include/cobalt/kernel/compat.h
index 05754cba8..c9cb84f72 100644
--- a/include/cobalt/kernel/compat.h
+++ b/include/cobalt/kernel/compat.h
@@ -105,9 +105,9 @@ int sys32_put_timeval(struct compat_timeval __user *ctv,
const struct timeval *tv);
int sys32_get_timex(struct timex *tx,
- const struct compat_timex __user *ctx);
+ const struct old_timex32 __user *ctx);
-int sys32_put_timex(struct compat_timex __user *ctx,
+int sys32_put_timex(struct old_timex32 __user *ctx,
const struct timex *tx);
ssize_t sys32_get_fdset(fd_set *fds, const compat_fd_set __user *cfds,
diff --git a/kernel/cobalt/posix/compat.c b/kernel/cobalt/posix/compat.c
index 17968bff1..a31ec0457 100644
--- a/kernel/cobalt/posix/compat.c
+++ b/kernel/cobalt/posix/compat.c
@@ -81,7 +81,7 @@ int sys32_put_timeval(struct compat_timeval __user *ctv,
EXPORT_SYMBOL_GPL(sys32_put_timeval);
int sys32_get_timex(struct timex *tx,
- const struct compat_timex __user *ctx)
+ const struct old_timex32 __user *ctx)
{
memset(tx, 0, sizeof(*tx));
@@ -112,7 +112,7 @@ int sys32_get_timex(struct timex *tx,
}
EXPORT_SYMBOL_GPL(sys32_get_timex);
-int sys32_put_timex(struct compat_timex __user *ctx,
+int sys32_put_timex(struct old_timex32 __user *ctx,
const struct timex *tx)
{
if (!access_wok(ctx, sizeof(*ctx)) ||
diff --git a/kernel/cobalt/posix/syscall32.c b/kernel/cobalt/posix/syscall32.c
index faa7ef53a..c2fd6a1e0 100644
--- a/kernel/cobalt/posix/syscall32.c
+++ b/kernel/cobalt/posix/syscall32.c
@@ -172,7 +172,7 @@ COBALT_SYSCALL32emu(clock_settime, current,
}
COBALT_SYSCALL32emu(clock_adjtime, current,
- (clockid_t clock_id, struct compat_timex __user *u_tx))
+ (clockid_t clock_id, struct old_timex32 __user *u_tx))
{
struct timex tx;
int ret;
diff --git a/kernel/cobalt/posix/syscall32.h b/kernel/cobalt/posix/syscall32.h
index 34904f96b..eb3e4bd30 100644
--- a/kernel/cobalt/posix/syscall32.h
+++ b/kernel/cobalt/posix/syscall32.h
@@ -65,7 +65,7 @@ COBALT_SYSCALL32emu_DECL(clock_settime,
COBALT_SYSCALL32emu_DECL(clock_adjtime,
(clockid_t clock_id,
- struct compat_timex __user *u_tx));
+ struct old_timex32 __user *u_tx));
COBALT_SYSCALL32emu_DECL(clock_nanosleep,
(clockid_t clock_id, int flags,
--
2.20.1
next reply other threads:[~2020-09-17 16:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 16:55 Fino Meng [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-18 5:56 [PATCH 1/4] cobalt/x86: adapt fpu code with Linux kernel upstream Fino Meng
2020-09-18 5:56 ` [PATCH 2/4] cobalt/kernel: adapt adjtime syscall with upstream kernel Fino Meng
2020-09-18 6:32 Fino Meng
2020-09-19 12:05 ` Jan Kiszka
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=20200917165504.GA6203@linux.intel.com \
--to=fino.meng@linux.intel.com \
--cc=xenomai@xenomai.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.