diff options
| author | Xiaoming Ni <nixiaoming@huawei.com> | 2020-07-17 16:01:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-07-17 20:31:20 +1000 |
| commit | db7b8002f00e46eec8f758df55aafdd07402e4d4 (patch) | |
| tree | b924496a39497b6b228d9463d31dfc99bd9a3aa6 | |
| parent | 731a4c25cc1164b799c591601b6a3e9faba485d5 (diff) | |
| download | linux-db7b8002f00e46eec8f758df55aafdd07402e4d4.tar.gz linux-db7b8002f00e46eec8f758df55aafdd07402e4d4.tar.xz | |
s390: fix build error for sys_call_table_emu
Build error on s390:
arch/s390/kernel/entry.o: in function `sys_call_table_emu':
>> (.rodata+0x1288): undefined reference to `__s390_'
In commit ("All arch: remove system call sys_sysctl")
148 common fdatasync sys_fdatasync sys_fdatasync
-149 common _sysctl sys_sysctl compat_sys_sysctl
+149 common _sysctl sys_ni_syscall
150 common mlock sys_mlock sys_mlock
After the patch is integrated, there is a format error in the generated
arch/s390/include/generated/asm/syscall_table.h:
SYSCALL(sys_fdatasync, sys_fdatasync)
SYSCALL(sys_ni_syscall,) /* cause build error */
SYSCALL(sys_mlock,sys_mlock)
According to the guidance of Heiko Carstens, use "-" to fill the empty
system call Similarly, modify
tools/perf/arch/s390/entry/syscalls/syscall.tbl.
Link: http://lkml.kernel.org/r/20200618141426.16884-1-nixiaoming@huawei.com
Fixes: ("All arch: remove system call sys_sysctl")
Fixes: https://lore.kernel.org/linuxppc-dev/20200616030734.87257-1-nixiaoming@huawei.com/
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | arch/s390/kernel/syscalls/syscall.tbl | 2 | ||||
| -rw-r--r-- | tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl index 5fe43807cc3d..51c8a704a119 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -138,7 +138,7 @@ 146 common writev sys_writev compat_sys_writev 147 common getsid sys_getsid sys_getsid 148 common fdatasync sys_fdatasync sys_fdatasync -149 common _sysctl sys_ni_syscall +149 common _sysctl - - 150 common mlock sys_mlock sys_mlock 151 common munlock sys_munlock sys_munlock 152 common mlockall sys_mlockall sys_mlockall diff --git a/tools/perf/arch/s390/entry/syscalls/syscall.tbl b/tools/perf/arch/s390/entry/syscalls/syscall.tbl index 0193f9b98753..29144b79a49d 100644 --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl @@ -138,7 +138,7 @@ 146 common writev sys_writev compat_sys_writev 147 common getsid sys_getsid sys_getsid 148 common fdatasync sys_fdatasync sys_fdatasync -149 common _sysctl sys_ni_syscall +149 common _sysctl - - 150 common mlock sys_mlock compat_sys_mlock 151 common munlock sys_munlock compat_sys_munlock 152 common mlockall sys_mlockall sys_mlockall |