diff options
Diffstat (limited to 'original/uapi/asm-generic')
| -rw-r--r-- | original/uapi/asm-generic/hugetlb_encode.h | 1 | ||||
| -rw-r--r-- | original/uapi/asm-generic/mman-common.h | 2 | ||||
| -rw-r--r-- | original/uapi/asm-generic/posix_types.h | 2 | ||||
| -rw-r--r-- | original/uapi/asm-generic/sembuf.h | 6 | ||||
| -rw-r--r-- | original/uapi/asm-generic/siginfo.h | 7 | ||||
| -rw-r--r-- | original/uapi/asm-generic/signal-defs.h | 63 | ||||
| -rw-r--r-- | original/uapi/asm-generic/signal.h | 29 | ||||
| -rw-r--r-- | original/uapi/asm-generic/socket.h | 3 | ||||
| -rw-r--r-- | original/uapi/asm-generic/unistd.h | 37 |
9 files changed, 46 insertions, 104 deletions
diff --git a/original/uapi/asm-generic/hugetlb_encode.h b/original/uapi/asm-generic/hugetlb_encode.h index 4f3d5aa..b0f8e87 100644 --- a/original/uapi/asm-generic/hugetlb_encode.h +++ b/original/uapi/asm-generic/hugetlb_encode.h @@ -20,7 +20,6 @@ #define HUGETLB_FLAG_ENCODE_SHIFT 26 #define HUGETLB_FLAG_ENCODE_MASK 0x3f -#define HUGETLB_FLAG_ENCODE_16KB (14 << HUGETLB_FLAG_ENCODE_SHIFT) #define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT) #define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT) #define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT) diff --git a/original/uapi/asm-generic/mman-common.h b/original/uapi/asm-generic/mman-common.h index f94f65d..c160a53 100644 --- a/original/uapi/asm-generic/mman-common.h +++ b/original/uapi/asm-generic/mman-common.h @@ -11,8 +11,6 @@ #define PROT_WRITE 0x2 /* page can be written */ #define PROT_EXEC 0x4 /* page can be executed */ #define PROT_SEM 0x8 /* page may be used for atomic ops */ -/* 0x10 reserved for arch-specific use */ -/* 0x20 reserved for arch-specific use */ #define PROT_NONE 0x0 /* page can not be accessed */ #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ diff --git a/original/uapi/asm-generic/posix_types.h b/original/uapi/asm-generic/posix_types.h index b5f7594..2f9c805 100644 --- a/original/uapi/asm-generic/posix_types.h +++ b/original/uapi/asm-generic/posix_types.h @@ -87,9 +87,7 @@ typedef struct { typedef __kernel_long_t __kernel_off_t; typedef long long __kernel_loff_t; typedef __kernel_long_t __kernel_old_time_t; -#ifndef __KERNEL__ typedef __kernel_long_t __kernel_time_t; -#endif typedef long long __kernel_time64_t; typedef __kernel_long_t __kernel_clock_t; typedef int __kernel_timer_t; diff --git a/original/uapi/asm-generic/sembuf.h b/original/uapi/asm-generic/sembuf.h index f54e48f..0e709bd 100644 --- a/original/uapi/asm-generic/sembuf.h +++ b/original/uapi/asm-generic/sembuf.h @@ -6,9 +6,9 @@ #include <asm/ipcbuf.h> /* - * The semid64_ds structure for most architectures (though it came from x86_32 - * originally). Note extra padding because this structure is passed back and - * forth between kernel and user space. + * The semid64_ds structure for x86 architecture. + * Note extra padding because this structure is passed back and forth + * between kernel and user space. * * semid64_ds was originally meant to be architecture specific, but * everyone just ended up making identical copies without specific diff --git a/original/uapi/asm-generic/siginfo.h b/original/uapi/asm-generic/siginfo.h index d259700..cb3d6c2 100644 --- a/original/uapi/asm-generic/siginfo.h +++ b/original/uapi/asm-generic/siginfo.h @@ -229,9 +229,7 @@ typedef struct siginfo { #define SEGV_ACCADI 5 /* ADI not enabled for mapped object */ #define SEGV_ADIDERR 6 /* Disrupting MCD error */ #define SEGV_ADIPERR 7 /* Precise MCD exception */ -#define SEGV_MTEAERR 8 /* Asynchronous ARM MTE error */ -#define SEGV_MTESERR 9 /* Synchronous ARM MTE exception */ -#define NSIGSEGV 9 +#define NSIGSEGV 7 /* * SIGBUS si_codes @@ -286,8 +284,7 @@ typedef struct siginfo { * SIGSYS si_codes */ #define SYS_SECCOMP 1 /* seccomp triggered */ -#define SYS_USER_DISPATCH 2 /* syscall user dispatch triggered */ -#define NSIGSYS 2 +#define NSIGSYS 1 /* * SIGEMT si_codes diff --git a/original/uapi/asm-generic/signal-defs.h b/original/uapi/asm-generic/signal-defs.h index fe929e7..e9304c9 100644 --- a/original/uapi/asm-generic/signal-defs.h +++ b/original/uapi/asm-generic/signal-defs.h @@ -4,69 +4,6 @@ #include <linux/compiler.h> -/* - * SA_FLAGS values: - * - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. - * SA_SIGINFO delivers the signal with SIGINFO structs. - * SA_ONSTACK indicates that a registered stack_t will be used. - * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_NODEFER prevents the current signal from being masked in the handler. - * SA_RESETHAND clears the handler when the signal is delivered. - * SA_UNSUPPORTED is a flag bit that will never be supported. Kernels from - * before the introduction of SA_UNSUPPORTED did not clear unknown bits from - * sa_flags when read using the oldact argument to sigaction and rt_sigaction, - * so this bit allows flag bit support to be detected from userspace while - * allowing an old kernel to be distinguished from a kernel that supports every - * flag bit. - * SA_EXPOSE_TAGBITS exposes an architecture-defined set of tag bits in - * siginfo.si_addr. - * - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single - * Unix names RESETHAND and NODEFER respectively. - */ -#ifndef SA_NOCLDSTOP -#define SA_NOCLDSTOP 0x00000001 -#endif -#ifndef SA_NOCLDWAIT -#define SA_NOCLDWAIT 0x00000002 -#endif -#ifndef SA_SIGINFO -#define SA_SIGINFO 0x00000004 -#endif -/* 0x00000008 used on alpha, mips, parisc */ -/* 0x00000010 used on alpha, parisc */ -/* 0x00000020 used on alpha, parisc, sparc */ -/* 0x00000040 used on alpha, parisc */ -/* 0x00000080 used on parisc */ -/* 0x00000100 used on sparc */ -/* 0x00000200 used on sparc */ -#define SA_UNSUPPORTED 0x00000400 -#define SA_EXPOSE_TAGBITS 0x00000800 -/* 0x00010000 used on mips */ -/* 0x01000000 used on x86 */ -/* 0x02000000 used on x86 */ -/* - * New architectures should not define the obsolete - * SA_RESTORER 0x04000000 - */ -#ifndef SA_ONSTACK -#define SA_ONSTACK 0x08000000 -#endif -#ifndef SA_RESTART -#define SA_RESTART 0x10000000 -#endif -#ifndef SA_NODEFER -#define SA_NODEFER 0x40000000 -#endif -#ifndef SA_RESETHAND -#define SA_RESETHAND 0x80000000 -#endif - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - #ifndef SIG_BLOCK #define SIG_BLOCK 0 /* for blocking signals */ #endif diff --git a/original/uapi/asm-generic/signal.h b/original/uapi/asm-generic/signal.h index f634822..5c716a9 100644 --- a/original/uapi/asm-generic/signal.h +++ b/original/uapi/asm-generic/signal.h @@ -52,6 +52,35 @@ #define SIGRTMAX _NSIG #endif +/* + * SA_FLAGS values: + * + * SA_ONSTACK indicates that a registered stack_t will be used. + * SA_RESTART flag to get restarting signals (which were the default long ago) + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. + * SA_RESETHAND clears the handler when the signal is delivered. + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. + * SA_NODEFER prevents the current signal from being masked in the handler. + * + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single + * Unix names RESETHAND and NODEFER respectively. + */ +#define SA_NOCLDSTOP 0x00000001 +#define SA_NOCLDWAIT 0x00000002 +#define SA_SIGINFO 0x00000004 +#define SA_ONSTACK 0x08000000 +#define SA_RESTART 0x10000000 +#define SA_NODEFER 0x40000000 +#define SA_RESETHAND 0x80000000 + +#define SA_NOMASK SA_NODEFER +#define SA_ONESHOT SA_RESETHAND + +/* + * New architectures should not define the obsolete + * SA_RESTORER 0x04000000 + */ + #if !defined MINSIGSTKSZ || !defined SIGSTKSZ #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 diff --git a/original/uapi/asm-generic/socket.h b/original/uapi/asm-generic/socket.h index 4dcd13d..77f7c16 100644 --- a/original/uapi/asm-generic/socket.h +++ b/original/uapi/asm-generic/socket.h @@ -119,9 +119,6 @@ #define SO_DETACH_REUSEPORT_BPF 68 -#define SO_PREFER_BUSY_POLL 69 -#define SO_BUSY_POLL_BUDGET 70 - #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) diff --git a/original/uapi/asm-generic/unistd.h b/original/uapi/asm-generic/unistd.h index ce58cff..1fc8faa 100644 --- a/original/uapi/asm-generic/unistd.h +++ b/original/uapi/asm-generic/unistd.h @@ -140,7 +140,7 @@ __SYSCALL(__NR_renameat, sys_renameat) #define __NR_umount2 39 __SYSCALL(__NR_umount2, sys_umount) #define __NR_mount 40 -__SYSCALL(__NR_mount, sys_mount) +__SC_COMP(__NR_mount, sys_mount, compat_sys_mount) #define __NR_pivot_root 41 __SYSCALL(__NR_pivot_root, sys_pivot_root) @@ -207,9 +207,9 @@ __SYSCALL(__NR_read, sys_read) #define __NR_write 64 __SYSCALL(__NR_write, sys_write) #define __NR_readv 65 -__SC_COMP(__NR_readv, sys_readv, sys_readv) +__SC_COMP(__NR_readv, sys_readv, compat_sys_readv) #define __NR_writev 66 -__SC_COMP(__NR_writev, sys_writev, sys_writev) +__SC_COMP(__NR_writev, sys_writev, compat_sys_writev) #define __NR_pread64 67 __SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64) #define __NR_pwrite64 68 @@ -237,7 +237,7 @@ __SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4) /* fs/splice.c */ #define __NR_vmsplice 75 -__SYSCALL(__NR_vmsplice, sys_vmsplice) +__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice) #define __NR_splice 76 __SYSCALL(__NR_splice, sys_splice) #define __NR_tee 77 @@ -517,7 +517,7 @@ __SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday) __SC_3264(__NR_adjtimex, sys_adjtimex_time32, sys_adjtimex) #endif -/* kernel/sys.c */ +/* kernel/timer.c */ #define __NR_getpid 172 __SYSCALL(__NR_getpid, sys_getpid) #define __NR_getppid 173 @@ -606,9 +606,9 @@ __SYSCALL(__NR_sendto, sys_sendto) #define __NR_recvfrom 207 __SC_COMP(__NR_recvfrom, sys_recvfrom, compat_sys_recvfrom) #define __NR_setsockopt 208 -__SC_COMP(__NR_setsockopt, sys_setsockopt, sys_setsockopt) +__SC_COMP(__NR_setsockopt, sys_setsockopt, compat_sys_setsockopt) #define __NR_getsockopt 209 -__SC_COMP(__NR_getsockopt, sys_getsockopt, sys_getsockopt) +__SC_COMP(__NR_getsockopt, sys_getsockopt, compat_sys_getsockopt) #define __NR_shutdown 210 __SYSCALL(__NR_shutdown, sys_shutdown) #define __NR_sendmsg 211 @@ -727,9 +727,11 @@ __SYSCALL(__NR_setns, sys_setns) #define __NR_sendmmsg 269 __SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg) #define __NR_process_vm_readv 270 -__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv) +__SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \ + compat_sys_process_vm_readv) #define __NR_process_vm_writev 271 -__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev) +__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \ + compat_sys_process_vm_writev) #define __NR_kcmp 272 __SYSCALL(__NR_kcmp, sys_kcmp) #define __NR_finit_module 273 @@ -848,24 +850,9 @@ __SYSCALL(__NR_pidfd_open, sys_pidfd_open) #define __NR_clone3 435 __SYSCALL(__NR_clone3, sys_clone3) #endif -#define __NR_close_range 436 -__SYSCALL(__NR_close_range, sys_close_range) - -#define __NR_openat2 437 -__SYSCALL(__NR_openat2, sys_openat2) -#define __NR_pidfd_getfd 438 -__SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd) -#define __NR_faccessat2 439 -__SYSCALL(__NR_faccessat2, sys_faccessat2) -#define __NR_process_madvise 440 -__SYSCALL(__NR_process_madvise, sys_process_madvise) -#define __NR_epoll_pwait2 441 -__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2) -#define __NR_mount_setattr 442 -__SYSCALL(__NR_mount_setattr, sys_mount_setattr) #undef __NR_syscalls -#define __NR_syscalls 443 +#define __NR_syscalls 436 /* * 32 bit systems traditionally used different |