diff options
| author | Haibo Huang <hhb@google.com> | 2020-08-07 20:16:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 20:16:17 +0000 |
| commit | 520e3479d53239e546c62832ebc64e1d382cdd4f (patch) | |
| tree | e1b3cd8e435837906ed1e0331358c2006f0cddc7 /src/arm/linux/init.c | |
| parent | 86e235ad4a82c0bd1e14ef57f7a5e26de4471299 (diff) | |
| parent | aff0604684a8512c65b551c8dc0025919036fc44 (diff) | |
| download | cpuinfo-520e3479d53239e546c62832ebc64e1d382cdd4f.tar.gz | |
Update cpuinfo to '63b254577ed77a8004a9be6ac707f3dccc4e1fd9' am: aff0604684
Original change: https://android-review.googlesource.com/c/platform/external/cpuinfo/+/1393123
Change-Id: Ieab38330ae0b69e71bdd96e85de1fd34f0e8a721
Diffstat (limited to 'src/arm/linux/init.c')
| -rw-r--r-- | src/arm/linux/init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/arm/linux/init.c b/src/arm/linux/init.c index 6272abf..89d957e 100644 --- a/src/arm/linux/init.c +++ b/src/arm/linux/init.c @@ -167,8 +167,9 @@ void cpuinfo_arm_linux_init(void) { struct cpuinfo_android_properties android_properties; cpuinfo_arm_android_parse_properties(&android_properties); #else - char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX] = { 0 }; + char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX]; #endif + char proc_cpuinfo_revision[CPUINFO_REVISION_VALUE_MAX]; if (!cpuinfo_arm_linux_parse_proc_cpuinfo( #if defined(__ANDROID__) @@ -176,6 +177,7 @@ void cpuinfo_arm_linux_init(void) { #else proc_cpuinfo_hardware, #endif + proc_cpuinfo_revision, arm_linux_processors_count, arm_linux_processors)) { cpuinfo_log_error("failed to parse processor information from /proc/cpuinfo"); @@ -228,10 +230,8 @@ void cpuinfo_arm_linux_init(void) { const struct cpuinfo_arm_chipset chipset = cpuinfo_arm_android_decode_chipset(&android_properties, valid_processors, 0); #else - const struct cpuinfo_arm_chipset chipset = { - .vendor = cpuinfo_arm_chipset_vendor_unknown, - .series = cpuinfo_arm_chipset_series_unknown, - }; + const struct cpuinfo_arm_chipset chipset = + cpuinfo_arm_linux_decode_chipset(proc_cpuinfo_hardware, proc_cpuinfo_revision, valid_processors, 0); #endif #if CPUINFO_ARCH_ARM |