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

Commit 325513d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes/cleanups from Catalin Marinas:
 "In Will's absence I'm sending the arm64 fixes he queued for 4.11-rc3:

   - fix arm64 kernel boot warning when DEBUG_VIRTUAL and KASAN are
     enabled

   - enable KEYS_COMPAT for keyctl compat support

   - use cpus_have_const_cap() for system_uses_ttbr0_pan() (slight
     performance improvement)

   - update kerneldoc for cpu_suspend() rename

   - remove the arm64-specific kprobe_exceptions_notify (weak generic
     variant defined)"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: kernel: Update kerneldoc for cpu_suspend() rename
  arm64: use const cap for system_uses_ttbr0_pan()
  arm64: support keyctl() system call in 32-bit mode
  arm64: kasan: avoid bad virt_to_pfn()
  arm64: kprobes: remove kprobe_exceptions_notify
parents 3009b303 0e4c0e6e

arch/arm64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,10 @@ config SYSVIPC_COMPAT 
	def_bool y

	depends on COMPAT && SYSVIPC



config KEYS_COMPAT

	def_bool y

	depends on COMPAT && KEYS



endmenu



menu "Power management options"

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static inline bool system_supports_fpsimd(void) 
static inline bool system_uses_ttbr0_pan(void)

{

	return IS_ENABLED(CONFIG_ARM64_SW_TTBR0_PAN) &&

		!cpus_have_cap(ARM64_HAS_PAN);

		!cpus_have_const_cap(ARM64_HAS_PAN);

}



#endif /* __ASSEMBLY__ */

arch/arm64/kernel/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ int arm_cpuidle_init(unsigned int cpu) 
}



/**

 * cpu_suspend() - function to enter a low-power idle state

 * arm_cpuidle_suspend() - function to enter a low-power idle state

 * @arg: argument to pass to CPU suspend operations

 *

 * Return: 0 on success, -EOPNOTSUPP if CPU suspend hook not initialized, CPU

arch/arm64/kernel/probes/kprobes.c

+0 −6
Original line number Diff line number Diff line
@@ -372,12 +372,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr) 
	return 0;

}



int __kprobes kprobe_exceptions_notify(struct notifier_block *self,

				       unsigned long val, void *data)

{

	return NOTIFY_DONE;

}



static void __kprobes kprobe_handler(struct pt_regs *regs)

{

	struct kprobe *p, *cur_kprobe;

arch/arm64/mm/kasan_init.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ void __init kasan_init(void) 
	clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);



	vmemmap_populate(kimg_shadow_start, kimg_shadow_end,

			 pfn_to_nid(virt_to_pfn(_text)));

			 pfn_to_nid(virt_to_pfn(lm_alias(_text))));



	/*

	 * vmemmap_populate() has populated the shadow region that covers the