diff options
| author | Mark Brown <broonie@kernel.org> | 2021-07-27 03:36:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-07-27 03:36:23 +0100 |
| commit | 5a0b5fbe7b41515ebf5e5cb1f70a6bd220f44df2 (patch) | |
| tree | 4c87298c3ad3c7b58c169e56cace092b80442372 /arch/arm64/include/asm/compat.h | |
| parent | c72249d40e91c77de63b782a84b115038341fde7 (diff) | |
| parent | 268ca4129d8da764fdf72916f762a1145c6ea743 (diff) | |
| download | linux-next-5a0b5fbe7b41515ebf5e5cb1f70a6bd220f44df2.tar.gz | |
Merge remote-tracking branch 'net-next/master'
# Conflicts:
# drivers/bus/mhi/pci_generic.c
Diffstat (limited to 'arch/arm64/include/asm/compat.h')
| -rw-r--r-- | arch/arm64/include/asm/compat.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 23a9fb73c04f..79c1a750e357 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -5,6 +5,9 @@ #ifndef __ASM_COMPAT_H #define __ASM_COMPAT_H +#define compat_mode_t compat_mode_t +typedef u16 compat_mode_t; + #include <asm-generic/compat.h> #ifdef CONFIG_COMPAT @@ -27,13 +30,9 @@ typedef u16 __compat_uid_t; typedef u16 __compat_gid_t; typedef u16 __compat_uid16_t; typedef u16 __compat_gid16_t; -typedef u32 __compat_uid32_t; -typedef u32 __compat_gid32_t; -typedef u16 compat_mode_t; typedef u32 compat_dev_t; typedef s32 compat_nlink_t; typedef u16 compat_ipc_pid_t; -typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; struct compat_stat { @@ -103,13 +102,6 @@ struct compat_statfs { #define COMPAT_RLIM_INFINITY 0xffffffff -typedef u32 compat_old_sigset_t; - -#define _COMPAT_NSIG 64 -#define _COMPAT_NSIG_BPW 32 - -typedef u32 compat_sigset_word; - #define COMPAT_OFF_T_MAX 0x7fffffff #define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current))) |