diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mm/mmu.c | 23 |
2 files changed, 6 insertions, 24 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) |