TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI / PPTT: fix build when CONFIG_ACPI_PPTT is not enabled

Browse Source 
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: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Sudeep Holla
2018-06-05 15:35:03 +01:00
committed by Catalin Marinas
parent 94a5d8790e
commit 2520e627db
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/acpi.h
+15
View File
@@ -1297,8 +1297,23 @@ static inline int lpit_read_residency_count_address(u64 *address)
} }
#endif #endif
#ifdef CONFIG_ACPI_PPTT
int find_acpi_cpu_topology(unsigned int cpu, int level); int find_acpi_cpu_topology(unsigned int cpu, int level);
int find_acpi_cpu_topology_package(unsigned int cpu); int find_acpi_cpu_topology_package(unsigned int cpu);
int find_acpi_cpu_cache_topology(unsigned int cpu, int level); 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*/ #endif /*_LINUX_ACPI_H*/
include/linux/cacheinfo.h
+1 -1
View File
@@ -98,7 +98,7 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu);
int init_cache_level(unsigned int cpu); int init_cache_level(unsigned int cpu);
int populate_cache_leaves(unsigned int cpu); int populate_cache_leaves(unsigned int cpu);
int cache_setup_acpi(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 * acpi_find_last_cache_level is only called on ACPI enabled
* platforms using the PPTT for topology. This means that if * platforms using the PPTT for topology. This means that if