Commit 42d1a731 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'aarch64/for-next/debug-virtual' into aarch64/for-next/core 

Merge core DEBUG_VIRTUAL changes from Laura Abbott. Later arm and arm64
support depends on these.

* aarch64/for-next/debug-virtual:
  drivers: firmware: psci: Use __pa_symbol for kernel symbol
  mm/usercopy: Switch to using lm_alias
  mm/kasan: Switch to using __pa_symbol and lm_alias
  kexec: Switch to __pa_symbol
  mm: Introduce lm_alias
  mm/cma: Cleanup highmem check
  lib/Kconfig.debug: Add ARCH_HAS_DEBUG_VIRTUAL
parents 4aa8a472 1a08e3d9

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config X86 
	select ARCH_CLOCKSOURCE_DATA

	select ARCH_DISCARD_MEMBLOCK

	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FAST_MULTIPLIER

drivers/firmware/psci.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static int psci_suspend_finisher(unsigned long index) 
	u32 *state = __this_cpu_read(psci_power_state);



	return psci_ops.cpu_suspend(state[index - 1],

				    virt_to_phys(cpu_resume));

				    __pa_symbol(cpu_resume));

}



int psci_cpu_suspend_enter(unsigned long index)

include/linux/mm.h

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ extern int mmap_rnd_compat_bits __read_mostly; 
#define page_to_virt(x)	__va(PFN_PHYS(page_to_pfn(x)))

#endif



#ifndef lm_alias

#define lm_alias(x)	__va(__pa_symbol(x))

#endif



/*

 * To prevent common memory management code establishing

 * a zero page mapping on a read fault.

kernel/kexec_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ void __weak arch_crash_save_vmcoreinfo(void) 


phys_addr_t __weak paddr_vmcoreinfo_note(void)

{

	return __pa((unsigned long)(char *)&vmcoreinfo_note);

	return __pa_symbol((unsigned long)(char *)&vmcoreinfo_note);

}



static int __init crash_save_vmcoreinfo_init(void)

lib/Kconfig.debug

+4 −1
Original line number Diff line number Diff line
@@ -622,9 +622,12 @@ config DEBUG_VM_PGFLAGS 


	  If unsure, say N.



config ARCH_HAS_DEBUG_VIRTUAL

	bool



config DEBUG_VIRTUAL

	bool "Debug VM translations"

	depends on DEBUG_KERNEL && X86

	depends on DEBUG_KERNEL && ARCH_HAS_DEBUG_VIRTUAL

	help

	  Enable some costly sanity checks in virtual to page code. This can

	  catch mistakes with virt_to_page() and friends.

CRA Git | Maintained and supported by SUSTech CRA and CCSE