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

Commit 64a172d2 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 fix from Catalin Marinas:
 "Fix kernel panic on ACPI-based systems where CPU capacity description
  is not currently handled"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: skip register_cpufreq_notifier on ACPI-based systems
parents ef1dce99 606f4226

arch/arm64/kernel/topology.c

+7 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * for more details.

 */



#include <linux/acpi.h>

#include <linux/cpu.h>

#include <linux/cpumask.h>

#include <linux/init.h>
@@ -209,7 +210,12 @@ static struct notifier_block init_cpu_capacity_notifier = { 


static int __init register_cpufreq_notifier(void)

{

	if (cap_parsing_failed)

	/*

	 * on ACPI-based systems we need to use the default cpu capacity

	 * until we have the necessary code to parse the cpu capacity, so

	 * skip registering cpufreq notifier.

	 */

	if (!acpi_disabled || cap_parsing_failed)

		return -EINVAL;



	if (!alloc_cpumask_var(&cpus_to_visit, GFP_KERNEL)) {