xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alpha: update syscall macro definitions

Browse Source 
Other architectures commonly use __NR_umount2 for sys_umount,
only ia64 and alpha use __NR_umount here. In order to synchronize
the generated tables, use umount2 like everyone else, and add back
the old name from asm/unistd.h for compatibility.

For shmat, alpha uses the osf_shmat name, we can do the same thing
here, which means we don't have to add an entry in the __IGNORE
list now that shmat is mandatory everywhere

alarm, creat, pause, time, and utime are optional everywhere
these days, no need to list them here any more.

I considered also adding the regular versions of the get*id system
calls that have different names and calling conventions on alpha,
which would further help unify the syscall ABI, but for now
I decided against that.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2018-12-30 15:16:48 +01:00
parent d012d1325b
commit 12b57c5c70
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/alpha/include/asm/unistd.h
View File

@@ -22,18 +22,12 @@
/* /*
* Ignore legacy syscalls that we don't use. * Ignore legacy syscalls that we don't use.
*/ */
#define __IGNORE_alarm
#define __IGNORE_creat
#define __IGNORE_getegid #define __IGNORE_getegid
#define __IGNORE_geteuid #define __IGNORE_geteuid
#define __IGNORE_getgid #define __IGNORE_getgid
#define __IGNORE_getpid #define __IGNORE_getpid
#define __IGNORE_getppid #define __IGNORE_getppid
#define __IGNORE_getuid #define __IGNORE_getuid
#define __IGNORE_pause
#define __IGNORE_time
#define __IGNORE_utime
#define __IGNORE_umount2
/* Alpha doesn't have protection keys. */ /* Alpha doesn't have protection keys. */
#define __IGNORE_pkey_mprotect #define __IGNORE_pkey_mprotect

5
arch/alpha/include/uapi/asm/unistd.h
View File

@@ -2,6 +2,11 @@
#ifndef _UAPI_ALPHA_UNISTD_H #ifndef _UAPI_ALPHA_UNISTD_H
#define _UAPI_ALPHA_UNISTD_H #define _UAPI_ALPHA_UNISTD_H
/* These are traditionally the names linux-alpha uses for
* the two otherwise generic system calls */
#define __NR_umount __NR_umount2
#define __NR_osf_shmat __NR_shmat
#include <asm/unistd_32.h> #include <asm/unistd_32.h>
#endif /* _UAPI_ALPHA_UNISTD_H */ #endif /* _UAPI_ALPHA_UNISTD_H */

4
arch/alpha/kernel/syscalls/syscall.tbl
View File

@@ -29,7 +29,7 @@
19 common lseek sys_lseek 19 common lseek sys_lseek
20 common getxpid sys_getxpid 20 common getxpid sys_getxpid
21 common osf_mount sys_osf_mount 21 common osf_mount sys_osf_mount
22 common umount sys_umount 22 common umount2 sys_umount
23 common setuid sys_setuid 23 common setuid sys_setuid
24 common getxuid sys_getxuid 24 common getxuid sys_getxuid
25 common exec_with_loader sys_ni_syscall 25 common exec_with_loader sys_ni_syscall
@@ -183,7 +183,7 @@
206 common semop sys_semop 206 common semop sys_semop
207 common osf_utsname sys_osf_utsname 207 common osf_utsname sys_osf_utsname
208 common lchown sys_lchown 208 common lchown sys_lchown
209 common osf_shmat sys_shmat 209 common shmat sys_shmat
210 common shmctl sys_shmctl 210 common shmctl sys_shmctl
211 common shmdt sys_shmdt 211 common shmdt sys_shmdt
212 common shmget sys_shmget 212 common shmget sys_shmget