diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-31 20:57:14 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-31 20:57:14 +0300 |
| commit | f12e840c819bab42621685558a01d3f46ab9a226 (patch) | |
| tree | ddb388d62bb9ceb9920cb2b4ac8b3493730d3f4d /arch/alpha/include/asm | |
| parent | e3ed513bcf0097c0b8a1f1b4d791a8d0d8933b3b (diff) | |
| parent | 1c3243f61fa7daea78de9866af2625f559ebf456 (diff) | |
| download | linux-f12e840c819bab42621685558a01d3f46ab9a226.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha architecture updates from Matt Turner:
"A few small changes for alpha as well as the new system call table
generation support from Firoz Khan"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: Remove some unused variables
alpha: rtc: simplify alpha_rtc_init
alpha: Fix a typo on ptrace.h
alpha: fix spelling mistake QSD_PORT_ACTUVE -> QSD_PORT_ACTIVE
alpha: generate uapi header and syscall table header files
alpha: add system call table generation support
alpha: add __NR_syscalls along with NR_SYSCALLS
alpha: remove CONFIG_OSF4_COMPAT flag from syscall table
alpha: move __IGNORE* entries to non uapi header
Diffstat (limited to 'arch/alpha/include/asm')
| -rw-r--r-- | arch/alpha/include/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/alpha/include/asm/unistd.h | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index 0580cb8c84b2..dc0ab28baca1 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 - +generated-y += syscall_table.h generic-y += compat.h generic-y += exec.h generic-y += export.h diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 9ff37aa1165f..21b706a5b772 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -4,7 +4,7 @@ #include <uapi/asm/unistd.h> -#define NR_SYSCALLS 523 +#define NR_SYSCALLS __NR_syscalls #define __ARCH_WANT_NEW_STAT #define __ARCH_WANT_OLD_READDIR @@ -19,4 +19,25 @@ #define __ARCH_WANT_SYS_VFORK #define __ARCH_WANT_SYS_CLONE +/* + * Ignore legacy syscalls that we don't use. + */ +#define __IGNORE_alarm +#define __IGNORE_creat +#define __IGNORE_getegid +#define __IGNORE_geteuid +#define __IGNORE_getgid +#define __IGNORE_getpid +#define __IGNORE_getppid +#define __IGNORE_getuid +#define __IGNORE_pause +#define __IGNORE_time +#define __IGNORE_utime +#define __IGNORE_umount2 + +/* Alpha doesn't have protection keys. */ +#define __IGNORE_pkey_mprotect +#define __IGNORE_pkey_alloc +#define __IGNORE_pkey_free + #endif /* _ALPHA_UNISTD_H */ |