summaryrefslogtreecommitdiff
path: root/src/arch/x86/include
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-05-14 11:21:41 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2019-05-16 18:08:50 +0000
commitbc674765a93bc5c9bf2c20ce2444389dccc754e1 (patch)
treeb363bda561b009f204ff3580f68afe318aead52b /src/arch/x86/include
parent2e8188aa13b84f607fd3a1e95fb7b63b26ff1d89 (diff)
downloadcoreboot-bc674765a93bc5c9bf2c20ce2444389dccc754e1.tar.xz
{arch,cpu}/x86, drivers/intel: Restore cpu_index error handling
Previously cpu_index() always succeeded, but since commit 095c931 (src/arch/x86: Use core apic id to get cpu_index()) it is now possible for it to indicate an error by returning -1. This commit adds error handling for all calls to cpu_index(), and restores several checks that were removed in commit 7c712bb (Fix code that would trip -Wtype-limits) but are now needed. Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Change-Id: I5436eed4cb5675f916924eb9670db04592a8b927 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32795 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/x86/include')
-rw-r--r--src/arch/x86/include/arch/cpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index 481ee9d8e0..078ea1748b 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -379,6 +379,6 @@ uint32_t cpu_get_feature_flags_edx(void);
* Hence new logic to use cpuid to fetch lapic id and matches with
* cpus_default_apic_id[] variable to return correct cpu_index().
*/
-unsigned long cpu_index(void);
+int cpu_index(void);
#endif /* ARCH_CPU_H */