summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2018-06-05 10:35:03 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2018-06-05 13:06:24 -0400
commit2520e627dbeecf7ccccc50c969504b59e1a3294b (patch)
treeffea1f7cbba539d2ce8fe7aeb4a08d53c15fa9eb
parent94a5d8790e79ab78f499d2d9f1ff2cab63849d9f (diff)
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: "Rafael J. Wysocki" <rjw@rjwysocki.net> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--include/linux/acpi.h15
-rw-r--r--include/linux/cacheinfo.h2
2 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 032e12a2fdc2..d2639cd2eafc 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -1297,8 +1297,23 @@ static inline int lpit_read_residency_count_address(u64 *address)
1297} 1297}
1298#endif 1298#endif
1299 1299
1300#ifdef CONFIG_ACPI_PPTT
1300int find_acpi_cpu_topology(unsigned int cpu, int level); 1301int find_acpi_cpu_topology(unsigned int cpu, int level);
1301int find_acpi_cpu_topology_package(unsigned int cpu); 1302int find_acpi_cpu_topology_package(unsigned int cpu);
1302int find_acpi_cpu_cache_topology(unsigned int cpu, int level); 1303int find_acpi_cpu_cache_topology(unsigned int cpu, int level);
1304#else
1305static inline int find_acpi_cpu_topology(unsigned int cpu, int level)
1306{
1307 return -EINVAL;
1308}
1309static inline int find_acpi_cpu_topology_package(unsigned int cpu)
1310{
1311 return -EINVAL;
1312}
1313static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
1314{
1315 return -EINVAL;
1316}
1317#endif
1303 1318
1304#endif /*_LINUX_ACPI_H*/ 1319#endif /*_LINUX_ACPI_H*/
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 89397e30e269..70e19bc6cc9f 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -98,7 +98,7 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu);
98int init_cache_level(unsigned int cpu); 98int init_cache_level(unsigned int cpu);
99int populate_cache_leaves(unsigned int cpu); 99int populate_cache_leaves(unsigned int cpu);
100int cache_setup_acpi(unsigned int cpu); 100int cache_setup_acpi(unsigned int cpu);
101#ifndef CONFIG_ACPI 101#ifndef CONFIG_ACPI_PPTT
102/* 102/*
103 * acpi_find_last_cache_level is only called on ACPI enabled 103 * acpi_find_last_cache_level is only called on ACPI enabled
104 * platforms using the PPTT for topology. This means that if 104 * platforms using the PPTT for topology. This means that if