From: guoren@kernel•org
To: guoren@kernel•org, palmer@dabbelt•com, arnd@arndb•de,
anup@brainfault•org, gregkh@linuxfoundation•org,
liush@allwinnertech•com, wefu@redhat•com, drew@beagleboard•org,
wangjunqiang@iscas•ac.cn, hch@lst•de, hch@infradead•org
Cc: linux-kernel@vger•kernel.org, linux-riscv@lists•infradead.org,
linux-csky@vger•kernel.org, linux-s390@vger•kernel.org,
sparclinux@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
inux-parisc@vger•kernel.org, linux-mips@vger•kernel.org,
linux-arm-kernel@lists•infradead.org, x86@kernel•org,
Guo Ren <guoren@linux•alibaba.com>
Subject: [PATCH V3 04/17] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT
Date: Thu, 20 Jan 2022 15:38:57 +0800 [thread overview]
Message-ID: <20220120073911.99857-5-guoren@kernel.org> (raw)
From: Guo Ren <guoren@linux•alibaba.com>
Make "uapi asm unistd.h" could be used for architectures' COMPAT
mode. The __SYSCALL_COMPAT is first used in riscv.
Signed-off-by: Guo Ren <guoren@linux•alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel•org>
Cc: Arnd Bergmann <arnd@arndb•de>
---
include/uapi/asm-generic/unistd.h | 4 ++--
tools/include/uapi/asm-generic/unistd.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 1c48b0ae3ba3..45fa180cc56a 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -383,7 +383,7 @@ __SYSCALL(__NR_syslog, sys_syslog)
/* kernel/ptrace.c */
#define __NR_ptrace 117
-__SYSCALL(__NR_ptrace, sys_ptrace)
+__SC_COMP(__NR_ptrace, sys_ptrace, compat_sys_ptrace)
/* kernel/sched/core.c */
#define __NR_sched_setparam 118
@@ -779,7 +779,7 @@ __SYSCALL(__NR_rseq, sys_rseq)
#define __NR_kexec_file_load 294
__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)
/* 295 through 402 are unassigned to sync up with generic numbers, don't use */
-#if __BITS_PER_LONG == 32
+#if defined(__SYSCALL_COMPAT) || __BITS_PER_LONG == 32
#define __NR_clock_gettime64 403
__SYSCALL(__NR_clock_gettime64, sys_clock_gettime)
#define __NR_clock_settime64 404
diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h
index 4557a8b6086f..aafe5cfeb27c 100644
--- a/tools/include/uapi/asm-generic/unistd.h
+++ b/tools/include/uapi/asm-generic/unistd.h
@@ -383,7 +383,7 @@ __SYSCALL(__NR_syslog, sys_syslog)
/* kernel/ptrace.c */
#define __NR_ptrace 117
-__SYSCALL(__NR_ptrace, sys_ptrace)
+__SC_COMP(__NR_ptrace, sys_ptrace, compat_sys_ptrace)
/* kernel/sched/core.c */
#define __NR_sched_setparam 118
@@ -779,7 +779,7 @@ __SYSCALL(__NR_rseq, sys_rseq)
#define __NR_kexec_file_load 294
__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)
/* 295 through 402 are unassigned to sync up with generic numbers, don't use */
-#if __BITS_PER_LONG == 32
+#if defined(__SYSCALL_COMPAT) || __BITS_PER_LONG == 32
#define __NR_clock_gettime64 403
__SYSCALL(__NR_clock_gettime64, sys_clock_gettime)
#define __NR_clock_settime64 404
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2022-01-20 7:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 7:38 guoren [this message]
2022-01-20 9:26 ` [PATCH V3 04/17] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT 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=20220120073911.99857-5-guoren@kernel.org \
--to=guoren@kernel$(echo .)org \
--cc=anup@brainfault$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=drew@beagleboard$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=guoren@linux$(echo .)alibaba.com \
--cc=hch@infradead$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=inux-parisc@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=liush@allwinnertech$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=wangjunqiang@iscas$(echo .)ac.cn \
--cc=wefu@redhat$(echo .)com \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox