From 80ded253e050c137c805128fd76aa6cc39720c31 Mon Sep 17 00:00:00 2001 From: Xiaoguang Wang Date: Wed, 3 Jun 2020 16:05:36 +0800 Subject: [PATCH] configs: enable CONFIG_COMPAT to #28170604 Or we will see below compile errors: In file included from net/atm/ioctl.c:24: ./include/net/compat.h:45:40: error: unknown type name 'compat_uptr_t'; did you mean 'compat_time_t'? 45 | struct sockaddr __user **save_addr, compat_uptr_t *ptr, | ^~~~~~~~~~~~~ | compat_time_t ./include/net/compat.h:46:4: error: unknown type name 'compat_size_t'; did you mean 'compat_time_t'? 46 | compat_size_t *len); | ^~~~~~~~~~~~~ | compat_time_t Signed-off-by: Xiaoguang Wang Reviewed-by: Shile Zhang Acked-by: Joseph Qi --- configs/config-4.19.y-aarch64 | 16 +++++++++++++++- configs/config-4.19.y-aarch64-debug | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configs/config-4.19.y-aarch64 b/configs/config-4.19.y-aarch64 index 2d5a35b0fd1e..9466d1730f20 100644 --- a/configs/config-4.19.y-aarch64 +++ b/configs/config-4.19.y-aarch64 @@ -161,9 +161,11 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_BPF=y # CONFIG_EXPERT is not set +CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y @@ -374,6 +376,7 @@ CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y +CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1463225=y @@ -434,6 +437,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_EL2_VECTORS=y CONFIG_ARM64_SSBD=y +# CONFIG_ARMV8_DEPRECATED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set # @@ -467,7 +471,8 @@ CONFIG_CMDLINE="console=ttyAMA0" CONFIG_EFI_STUB=y CONFIG_EFI=y CONFIG_DMI=y -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y +CONFIG_SYSVIPC_COMPAT=y # # Power management options @@ -719,8 +724,13 @@ CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_HAVE_RELIABLE_STACKTRACE=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -798,6 +808,7 @@ CONFIG_BSD_DISKLABEL=y CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set # CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y @@ -886,6 +897,7 @@ CONFIG_FREEZER=y # Executable file formats # CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y @@ -4977,6 +4989,7 @@ CONFIG_IO_WQ=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m @@ -5275,6 +5288,7 @@ CONFIG_CRC8=m CONFIG_XXHASH=m CONFIG_AUDIT_GENERIC=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +CONFIG_AUDIT_COMPAT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y diff --git a/configs/config-4.19.y-aarch64-debug b/configs/config-4.19.y-aarch64-debug index 57fca1e14f24..59b9cff9c11b 100644 --- a/configs/config-4.19.y-aarch64-debug +++ b/configs/config-4.19.y-aarch64-debug @@ -164,9 +164,11 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_BPF=y # CONFIG_EXPERT is not set +CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y @@ -378,6 +380,7 @@ CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y +CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1463225=y @@ -438,6 +441,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_EL2_VECTORS=y CONFIG_ARM64_SSBD=y +# CONFIG_ARMV8_DEPRECATED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set # @@ -471,7 +475,8 @@ CONFIG_CMDLINE="console=ttyAMA0" CONFIG_EFI_STUB=y CONFIG_EFI=y CONFIG_DMI=y -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y +CONFIG_SYSVIPC_COMPAT=y # # Power management options @@ -724,8 +729,13 @@ CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_HAVE_RELIABLE_STACKTRACE=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y @@ -802,6 +812,7 @@ CONFIG_BSD_DISKLABEL=y CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set # CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y @@ -866,6 +877,7 @@ CONFIG_FREEZER=y # Executable file formats # CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y @@ -4959,6 +4971,7 @@ CONFIG_IO_WQ=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m @@ -5257,6 +5270,7 @@ CONFIG_CRC8=m CONFIG_XXHASH=m CONFIG_AUDIT_GENERIC=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +CONFIG_AUDIT_COMPAT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -- GitLab