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-arch@vger•kernel.org, linux-s390@vger•kernel.org,
Guo Ren <guoren@linux•alibaba.com>,
linux-parisc@vger•kernel.org, x86@kernel•org,
linux-kernel@vger•kernel.org, linux-csky@vger•kernel.org,
linux-mips@vger•kernel.org, sparclinux@vger•kernel.org,
linux-riscv@lists•infradead.org, linuxppc-dev@lists•ozlabs.org,
linux-arm-kernel@lists•infradead.org
Subject: [PATCH V4 04/17] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT
Date: Sat, 29 Jan 2022 20:17:15 +0800 [thread overview]
Message-ID: <20220129121728.1079364-5-guoren@kernel.org> (raw)
In-Reply-To: <20220129121728.1079364-1-guoren@kernel.org>
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>
Reviewed-by: 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 1c48b0ae3ba3..45fa180cc56a 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
next prev parent reply other threads:[~2022-01-29 12:21 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-29 12:17 [PATCH V4 00/17] riscv: compat: Add COMPAT mode support for rv64 guoren
2022-01-29 12:17 ` [PATCH V4 01/17] kconfig: Add SYSVIPC_COMPAT for all architectures guoren
2022-01-31 12:19 ` Christoph Hellwig
2022-01-29 12:17 ` [PATCH V4 02/17] fs: stat: compat: Add __ARCH_WANT_COMPAT_STAT guoren
2022-01-31 12:19 ` Christoph Hellwig
2022-01-29 12:17 ` [PATCH V4 03/17] asm-generic: compat: Cleanup duplicate definitions guoren
2022-01-29 21:40 ` Arnd Bergmann
2022-01-31 12:21 ` Christoph Hellwig
2022-01-31 13:52 ` Guo Ren
2022-01-29 12:17 ` guoren [this message]
2022-01-31 12:21 ` [PATCH V4 04/17] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT Christoph Hellwig
2022-01-29 12:17 ` [PATCH V4 05/17] riscv: Fixup difference with defconfig guoren
2022-01-31 12:23 ` Christoph Hellwig
2022-01-31 12:48 ` Arnd Bergmann
2022-01-31 13:00 ` Christoph Hellwig
2022-01-31 13:19 ` Arnd Bergmann
2022-01-29 12:17 ` [PATCH V4 06/17] riscv: compat: Add basic compat date type implementation guoren
2022-01-29 21:56 ` Arnd Bergmann
2022-01-30 5:47 ` Guo Ren
2022-01-30 11:36 ` Arnd Bergmann
2022-01-29 12:17 ` [PATCH V4 07/17] riscv: compat: Re-implement TASK_SIZE for COMPAT_32BIT guoren
2022-01-29 12:17 ` [PATCH V4 08/17] riscv: compat: syscall: Add compat_sys_call_table implementation guoren
2022-01-29 22:12 ` Arnd Bergmann
2022-01-30 5:54 ` Guo Ren
2022-01-30 11:32 ` Arnd Bergmann
2022-01-30 14:57 ` Guo Ren
2022-01-29 12:17 ` [PATCH V4 09/17] riscv: compat: syscall: Add entry.S implementation guoren
2022-01-29 12:17 ` [PATCH V4 10/17] riscv: compat: process: Add UXL_32 support in start_thread guoren
2022-01-29 12:17 ` [PATCH V4 11/17] riscv: compat: Add elf.h implementation guoren
2022-01-29 12:17 ` [PATCH V4 12/17] riscv: compat: vdso: Add rv32 VDSO base code implementation guoren
2022-01-29 12:17 ` [PATCH V4 13/17] riscv: compat: vdso: Add setup additional pages implementation guoren
2022-01-29 12:17 ` [PATCH V4 14/17] riscv: compat: signal: Add rt_frame implementation guoren
2022-01-29 12:17 ` [PATCH V4 15/17] riscv: compat: ptrace: Add compat_arch_ptrace implement guoren
2022-01-29 12:17 ` [PATCH V4 16/17] riscv: compat: Add COMPAT Kbuild skeletal support guoren
2022-01-31 12:26 ` Christoph Hellwig
2022-01-31 13:50 ` Guo Ren
2022-02-01 7:44 ` Christoph Hellwig
2022-02-01 9:13 ` Guo Ren
2022-02-01 9:36 ` Arnd Bergmann
2022-02-01 10:26 ` Guo Ren
2022-02-01 11:48 ` Arnd Bergmann
2022-02-01 13:56 ` Guo Ren
2022-01-29 12:17 ` [PATCH V4 17/17] KVM: compat: riscv: Prevent KVM_COMPAT from being selected guoren
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=20220129121728.1079364-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=linux-arch@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-parisc@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