Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d903c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:

 - MM remainders

 - various misc things

 - kcov updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (27 commits)
  lib/test_printf.c: call wait_for_random_bytes() before plain %p tests
  hexagon: drop the unused variable zero_page_mask
  hexagon: fix printk format warning in setup.c
  mm: fix oom_kill event handling
  treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX
  mm: use octal not symbolic permissions
  ipc: use new return type vm_fault_t
  sysvipc/sem: mitigate semnum index against spectre v1
  fault-injection: reorder config entries
  arm: port KCOV to arm
  sched/core / kcov: avoid kcov_area during task switch
  kcov: prefault the kcov_area
  kcov: ensure irq code sees a valid area
  kernel/relay.c: change return type to vm_fault_t
  exofs: avoid VLA in structures
  coredump: fix spam with zero VMA process
  fat: use fat_fs_error() instead of BUG_ON() in __fat_get_block()
  proc: skip branch in /proc/*/* lookup
  mremap: remove LATENCY_LIMIT from mremap to reduce the number of TLB shootdowns
  mm/memblock: add missing include <linux/bootmem.h>
  ...
parents 7a932516 ee410f15

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -8,9 +8,10 @@ config ARM 
	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_KCOV

	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

	select ARCH_HAS_STRICT_MODULE_RWX if MMU

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

arch/arm/boot/compressed/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ endif 


GCOV_PROFILE		:= n



# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.

KCOV_INSTRUMENT		:= n



#

# Architecture dependencies

#

arch/arm/kvm/hyp/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -23,3 +23,11 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o 
obj-$(CONFIG_KVM_ARM_HOST) += switch.o

CFLAGS_switch.o		   += $(CFLAGS_ARMV7VE)

obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o



# KVM code is run at a different exception code with a different map, so

# compiler instrumentation that inserts callbacks or checks into the code may

# cause crashes. Just disable it.

GCOV_PROFILE	:= n

KASAN_SANITIZE	:= n

UBSAN_SANITIZE	:= n

KCOV_INSTRUMENT	:= n

arch/arm/vdso/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ CFLAGS_vgettimeofday.o = -O2 
# Disable gcov profiling for VDSO code

GCOV_PROFILE := n



# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.

KCOV_INSTRUMENT := n



# Force dependency

$(obj)/vdso.o : $(obj)/vdso.so

arch/arm64/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void __init arm64_memory_present(void) 
}

#endif



static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX;

static phys_addr_t memory_limit = PHYS_ADDR_MAX;



/*

 * Limit the memory size that was specified via FDT.
@@ -401,7 +401,7 @@ void __init arm64_memblock_init(void) 
	 * high up in memory, add back the kernel region that must be accessible

	 * via the linear mapping.

	 */

	if (memory_limit != (phys_addr_t)ULLONG_MAX) {

	if (memory_limit != PHYS_ADDR_MAX) {

		memblock_mem_limit_remove_map(memory_limit);

		memblock_add(__pa_symbol(_text), (u64)(_end - _text));

	}
@@ -666,7 +666,7 @@ __setup("keepinitrd", keepinitrd_setup); 
 */

static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p)

{

	if (memory_limit != (phys_addr_t)ULLONG_MAX) {

	if (memory_limit != PHYS_ADDR_MAX) {

		pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20);

	} else {

		pr_emerg("Memory Limit: none\n");