diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 23 | ||||
-rw-r--r-- | arch/arm64/Kconfig | 21 | ||||
-rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 7 | ||||
-rw-r--r-- | arch/mips/include/uapi/asm/unistd.h | 6 |
5 files changed, 10 insertions, 54 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0c2b55e9242a..924ea5bec5bf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -28,7 +28,7 @@ config ARM select HARDIRQS_SW_RESEND select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL select HAVE_ARCH_KGDB - select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) select HAVE_ARCH_TRACEHOOK select HAVE_BPF_JIT select HAVE_CONTEXT_TRACKING @@ -1763,6 +1763,11 @@ config OABI_COMPAT in memory differs between the legacy ABI and the new ARM EABI (only for non "thumb" binaries). This option adds a tiny overhead to all syscalls and produces a slightly larger kernel. + + The seccomp filter system will not be available when this is + selected, since there is no way yet to sensibly distinguish + between calling conventions during filtering. + If you know you'll be using only pure EABI user space then you can say N here. If this option is not selected and you attempt to execute a legacy ABI binary then the result will be diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 4bd2f2c38f56..f15c22e8bcd5 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1069,29 +1069,6 @@ void __init sanity_check_meminfo(void) phys_addr_t size_limit; *bank = meminfo.bank[i]; - -#ifdef CONFIG_SPARSEMEM - if (pfn_to_section_nr(bank_pfn_start(bank)) != - pfn_to_section_nr(bank_pfn_end(bank) - 1)) { - phys_addr_t sz; - unsigned long start_pfn = bank_pfn_start(bank); - unsigned long end_pfn = SECTION_ALIGN_UP(start_pfn + 1); - sz = ((phys_addr_t)(end_pfn - start_pfn) << PAGE_SHIFT); - - if (meminfo.nr_banks >= NR_BANKS) { - pr_crit("NR_BANKS too low, ignoring %lld bytes of memory\n", - (unsigned long long)(bank->size - sz)); - } else { - memmove(bank + 1, bank, - (meminfo.nr_banks - i) * sizeof(*bank)); - meminfo.nr_banks++; - bank[1].size -= sz; - bank[1].start = __pfn_to_phys(end_pfn); - } - bank->size = sz; - } -#endif - size_limit = bank->size; if (bank->start >= vmalloc_limit) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c10c8b3e3959..0c9e4d1086f7 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -371,27 +371,6 @@ config ARCH_WANT_HUGE_PMD_SHARE config HAVE_ARCH_TRANSPARENT_HUGEPAGE def_bool y -config ARMV7_COMPAT - bool "Kernel support for ARMv7 applications" - depends on COMPAT - select SWP_EMULATE - help - This option enables features that allow that ran on an ARMv7 or older - processor to continue functioning. - - If you want to execute ARMv7 applications, say Y - -config ARMV7_COMPAT_CPUINFO - bool "Report backwards compatible cpu features in /proc/cpuinfo" - depends on ARMV7_COMPAT - default y - help - This option makes /proc/cpuinfo list CPU features that an ARMv7 or - earlier kernel would report, but are not optional on an ARMv8 or later - processor. - - If you want to execute ARMv7 applications, say Y - source "mm/Kconfig" config XEN_DOM0 diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index aab72ce22348..7fb343779498 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -143,14 +143,7 @@ static inline int reinstall_suspended_bps(struct pt_regs *regs) } #endif -#ifdef CONFIG_COMPAT int aarch32_break_handler(struct pt_regs *regs); -#else -static int aarch32_break_handler(struct pt_regs *regs) -{ - return -EFAULT; -} -#endif #endif /* __ASSEMBLY */ #endif /* __KERNEL__ */ diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index 19244e913837..d6e154a9e6a5 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -1029,15 +1029,17 @@ #define __NR_process_vm_writev (__NR_Linux + 310) #define __NR_kcmp (__NR_Linux + 311) #define __NR_finit_module (__NR_Linux + 312) +#define __NR_sched_setattr (__NR_Linux + 313) +#define __NR_sched_getattr (__NR_Linux + 314) /* * Offset of the last N32 flavoured syscall */ -#define __NR_Linux_syscalls 312 +#define __NR_Linux_syscalls 314 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ #define __NR_N32_Linux 6000 -#define __NR_N32_Linux_syscalls 312 +#define __NR_N32_Linux_syscalls 314 #endif /* _UAPI_ASM_UNISTD_H */ |