aboutsummaryrefslogtreecommitdiff
path: root/src/arm/linux/init.c
diff options
context:
space:
mode:
authorMarat Dukhan <maratek@gmail.com>2017-10-15 21:50:11 +0000
committerMarat Dukhan <maratek@gmail.com>2017-10-15 21:51:42 +0000
commit7c775ab8f0db856b49c1ea9152e14f86f5e920c2 (patch)
tree61514e971a6a3e895c943884375805f6ed5cfda2 /src/arm/linux/init.c
parent8469cfe0f1bc43f351d3c4f914bcf878f07047ca (diff)
downloadcpuinfo-7c775ab8f0db856b49c1ea9152e14f86f5e920c2.tar.gz
Fix build on ARM/Linux
Diffstat (limited to 'src/arm/linux/init.c')
-rw-r--r--src/arm/linux/init.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/arm/linux/init.c b/src/arm/linux/init.c
index a7c5fa0..a6919d3 100644
--- a/src/arm/linux/init.c
+++ b/src/arm/linux/init.c
@@ -286,12 +286,15 @@ void cpuinfo_arm_linux_init(void) {
#if defined(__ANDROID__)
const struct cpuinfo_arm_chipset chipset =
cpuinfo_arm_android_decode_chipset(&android_properties, usable_processors, 0);
+#else
+ const struct cpuinfo_arm_chipset chipset = {
+ .vendor = cpuinfo_arm_chipset_vendor_unknown,
+ .series = cpuinfo_arm_chipset_series_unknown,
+ };
#endif
const uint32_t cluster_count = cpuinfo_arm_linux_detect_cluster_midr(
-#if defined(__ANDROID__)
&chipset,
-#endif
arm_linux_processors_count, usable_processors, arm_linux_processors);
/* Initialize core vendor, uarch, MIDR, and frequency for every logical processor */
@@ -342,9 +345,7 @@ void cpuinfo_arm_linux_init(void) {
* - Level 1 instruction and data caches are private to the core clusters.
* - Level 2 cache is shared between cores in the same cluster.
*/
-#if defined(__ANDROID__)
cpuinfo_arm_chipset_to_string(&chipset, package.name);
-#endif
package.processor_count = package.core_count = usable_processors;
processors = calloc(usable_processors, sizeof(struct cpuinfo_processor));
@@ -427,10 +428,8 @@ void cpuinfo_arm_linux_init(void) {
arm_linux_processors[i].uarch,
arm_linux_processors[i].package_processor_count,
arm_linux_processors[i].midr,
-#if defined(__ANDROID__)
&chipset,
cluster_id,
-#endif
arm_linux_processors[i].architecture_version,
&l1i[i], &l1d[i], &shared_l2);
l1i[i].processor_start = l1d[i].processor_start = i;