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

Commit 2520e627 authored by Sudeep Holla's avatar Sudeep Holla Committed by Catalin Marinas
Browse files

ACPI / PPTT: fix build when CONFIG_ACPI_PPTT is not enabled 



Though CONFIG_ACPI_PPTT is selected by platforms and nor user visible,
it may be useful to support the build with CONFIG_ACPI_PPTT disabled.

This patch adds the missing dummy/boiler plate implementation to fix
the build.

Acked-by: default avatar"Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 94a5d879

include/linux/acpi.h

+15 −0
Original line number Diff line number Diff line
@@ -1297,8 +1297,23 @@ static inline int lpit_read_residency_count_address(u64 *address) 
}

#endif



#ifdef CONFIG_ACPI_PPTT

int find_acpi_cpu_topology(unsigned int cpu, int level);

int find_acpi_cpu_topology_package(unsigned int cpu);

int find_acpi_cpu_cache_topology(unsigned int cpu, int level);

#else

static inline int find_acpi_cpu_topology(unsigned int cpu, int level)

{

	return -EINVAL;

}

static inline int find_acpi_cpu_topology_package(unsigned int cpu)

{

	return -EINVAL;

}

static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level)

{

	return -EINVAL;

}

#endif



#endif	/*_LINUX_ACPI_H*/

include/linux/cacheinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu); 
int init_cache_level(unsigned int cpu);

int populate_cache_leaves(unsigned int cpu);

int cache_setup_acpi(unsigned int cpu);

#ifndef CONFIG_ACPI

#ifndef CONFIG_ACPI_PPTT

/*

 * acpi_find_last_cache_level is only called on ACPI enabled

 * platforms using the PPTT for topology. This means that if