Commit 995177a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "Not much this time around, the 5.20-rc1 development updates for arm
  are:

   - add KASAN support for vmalloc space on arm

   - some sparse fixes from Ben Dooks

   - rework amba device handling (so device addition isn't deferred)"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9220/1: amba: Remove deferred device addition
  ARM: 9219/1: fix undeclared soft_restart
  ARM: 9218/1: dma-mapping: fix pointer/integer warning
  ARM: 9217/1: add definition of arch_irq_work_raise()
  ARM: 9203/1: kconfig: fix MODULE_PLTS for KASAN with KASAN_VMALLOC
  ARM: 9202/1: kasan: support CONFIG_KASAN_VMALLOC
parents 7df9075e f2d3b9a4

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ config ARM 
	select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL

	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU

	select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL

	select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN

	select HAVE_ARCH_MMAP_RND_BITS if MMU

	select HAVE_ARCH_PFN_VALID

	select HAVE_ARCH_SECCOMP
@@ -1419,6 +1420,7 @@ config HW_PERF_EVENTS 
config ARM_MODULE_PLTS

	bool "Use PLTs to allow module memory to spill over into vmalloc area"

	depends on MODULES

	select KASAN_VMALLOC if KASAN

	default y

	help

	  Allocate PLTs when loading modules so that jumps and calls whose

arch/arm/include/asm/irq_work.h

+2 −0
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ static inline bool arch_irq_work_has_interrupt(void) 
	return is_smp();

}



extern void arch_irq_work_raise(void);



#endif /* _ASM_ARM_IRQ_WORK_H */

arch/arm/kernel/reboot.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/cacheflush.h>

#include <asm/idmap.h>

#include <asm/virt.h>

#include <asm/system_misc.h>



#include "reboot.h"

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, 


	*handle = DMA_MAPPING_ERROR;

	allowblock = gfpflags_allow_blocking(gfp);

	cma = allowblock ? dev_get_cma_area(dev) : false;

	cma = allowblock ? dev_get_cma_area(dev) : NULL;



	if (cma)

		buf->allocator = &cma_allocator;

arch/arm/mm/kasan_init.c

+5 −1
Original line number Diff line number Diff line
@@ -236,7 +236,11 @@ void __init kasan_init(void) 


	clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);



	if (!IS_ENABLED(CONFIG_KASAN_VMALLOC))

		kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START),

					    kasan_mem_to_shadow((void *)VMALLOC_END));



	kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_END),

				    kasan_mem_to_shadow((void *)-1UL) + 1);



	for_each_mem_range(i, &pa_start, &pa_end) {