From 1799290ea2bb628516485bfb14a7fb809c21e5f9 Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Thu, 27 Oct 2022 14:12:55 +0200 Subject: acpigen: Always inline helper functions Acpigen inline helper functions are causing problems while compiling coreboot with function instrumentation. Sometimes functions are not inlined and are causing linking errors. Forcing inlining fixes problems like that, as these functions would normally be inlined anyway. Signed-off-by: Jakub Czapiga Change-Id: Ibf747573940fe5e76199f327f4e5bc32b4f8c470 Reviewed-on: https://review.coreboot.org/c/coreboot/+/68923 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/include/acpi/acpigen.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/acpi/acpigen.h b/src/include/acpi/acpigen.h index 4af7460ccb..4546cffd34 100644 --- a/src/include/acpi/acpigen.h +++ b/src/include/acpi/acpigen.h @@ -376,7 +376,7 @@ void acpigen_pop_len(void); void acpigen_set_current(char *curr); char *acpigen_get_current(void); char *acpigen_write_package(int nr_el); -inline void acpigen_write_package_end(void) +__always_inline void acpigen_write_package_end(void) { acpigen_pop_len(); } @@ -406,23 +406,23 @@ void acpigen_write_name_byte(const char *name, uint8_t val); void acpigen_write_name_integer(const char *name, uint64_t val); void acpigen_write_coreboot_hid(enum coreboot_acpi_ids id); void acpigen_write_scope(const char *name); -inline void acpigen_write_scope_end(void) +__always_inline void acpigen_write_scope_end(void) { acpigen_pop_len(); } void acpigen_write_method(const char *name, int nargs); void acpigen_write_method_serialized(const char *name, int nargs); -inline void acpigen_write_method_end(void) +__always_inline void acpigen_write_method_end(void) { acpigen_pop_len(); } void acpigen_write_device(const char *name); -inline void acpigen_write_device_end(void) +__always_inline void acpigen_write_device_end(void) { acpigen_pop_len(); } void acpigen_write_thermal_zone(const char *name); -inline void acpigen_write_thermal_zone_end(void) +__always_inline void acpigen_write_thermal_zone_end(void) { acpigen_pop_len(); } @@ -450,7 +450,7 @@ void acpigen_write_xpss_package(const struct acpi_xpss_sw_pstate *pstate_value); void acpigen_write_xpss_object(const struct acpi_xpss_sw_pstate *pstate_values, size_t nentries); void acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len); -inline void acpigen_write_processor_end(void) +__always_inline void acpigen_write_processor_end(void) { acpigen_pop_len(); } @@ -471,7 +471,7 @@ void acpigen_write_irq(u16 mask); void acpigen_write_uuid(const char *uuid); void acpigen_write_power_res(const char *name, uint8_t level, uint16_t order, const char * const dev_states[], size_t dev_states_count); -inline void acpigen_write_power_res_end(void) +__always_inline void acpigen_write_power_res_end(void) { acpigen_pop_len(); } @@ -494,7 +494,7 @@ void acpigen_write_if_and(uint8_t arg1, uint8_t arg2); void acpigen_write_if_lequal_op_op(uint8_t op, uint8_t val); void acpigen_write_if_lequal_op_int(uint8_t op, uint64_t val); void acpigen_write_if_lequal_namestr_int(const char *namestr, uint64_t val); -inline void acpigen_write_if_end(void) +__always_inline void acpigen_write_if_end(void) { acpigen_pop_len(); } -- cgit v1.2.3