ACPI: utils: acpi_evaluate_dsm_typed - fix redefinition error
Subsystems (2)
PATCH 1/1 ACPI: utils: acpi_evaluate_dsm_typed - fix redefinition error
acpi_evaluate_dsm_typed function needs to be gaurded with CONFIG_ACPI to avoid redefintion error when stub is also enabled.
In file included from ../drivers/bluetooth/btintel.c:13:../include/acpi/acpi_bus.h:57:1: error: redefinition of 'acpi_evaluate_dsm_typed'
57 | acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid,..
| ^~~~~~~~~~~~~~~~~~~~~~~
In file included from ../drivers/bluetooth/btintel.c:12:../include/linux/acpi.h:967:34: note: previous definition of 'acpi_evaluate_dsm_typed' with type 'union acpi_object *(void *, const guid_t *, u64, u64, union acpi_object *, acpi_object_type)' {aka 'union acpi_object *(void *, const guid_t *, long long unsigned int, long long unsigned int, union acpi_object *, unsigned int)'}
967 | static inline union acpi_object
*acpi_evaluate_dsm_typed(acpi_handle handle,
---
Steps to reproduce:
1. Apply this bluetooth specific patch - https://patchwork.kernel.org/project/bluetooth/patch/[email protected]/
2. Follow the steps suggedted by lkp bot to compile bluetooth
include/acpi/acpi_bus.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/acpi/acpi_bus.h +2 -1
@@ -52,7 +52,7 @@ bool acpi_dock_match(acpi_handle handle);bool acpi_check_dsm (acpi_handle handle,const guid_t *guid,u64 rev,u64 funcs);union acpi_object *acpi_evaluate_dsm (acpi_handle handle,const guid_t *guid,u64 rev,u64 func,union acpi_object *argv4); - +#ifdef CONFIG_ACPI static inline union acpi_object * acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev, u64 func, union acpi_object *argv4,
@@ -68,6 +68,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,return obj; } +#endif #define ACPI_INIT_DSM_ARGV4 (cnt, eles) \ { \
Signature · 1 line
2.17.1
Rafael J. Wysocki
maintainerQuoted 42 lines · Kiran K
acpi_evaluate_dsm_typedfunction needs to be gaurded withCONFIG_ACPIto avoid redefintion error when stub is also enabled.In file included from
../drivers/bluetooth/btintel.c:13:../include/acpi/acpi_bus.h:57:1: error: redefinition of 'acpi_evaluate_dsm_typed'
57 | acpi_evaluate_dsm_typed(acpi_handle handle, constguid_t*guid,..| ^~~~~~~~~~~~~~~~~~~~~~~In file included from
../drivers/bluetooth/btintel.c:12:../include/linux/acpi.h:967:34: note: previous definition of 'acpi_evaluate_dsm_typed' with type 'unionacpi_object*(void *, constguid_t*, u64, u64, unionacpi_object*,acpi_object_type)' {aka 'unionacpi_object*(void *, constguid_t*, long long unsigned int, long long unsigned int, unionacpi_object*, unsigned int)'}
967 | static inline unionacpi_object
*acpi_evaluate_dsm_typed(acpi_handle handle,Fixes 1b94ad7ccc21 ("ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi_check_dsm() stubs")Signed-off-by Kiran K <[email protected]>---
Steps to reproduce:
1. Apply this bluetooth specific patch - https://patchwork.kernel.org/project/bluetooth/patch/[email protected]/
2. Follow the steps suggedted by lkp bot to compile bluetoothinclude/acpi/acpi_bus.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)include/acpi/acpi_bus.h +1
-1@@ -52,7 +52,7 @@ bool acpi_dock_match(acpi_handle handle);bool acpi_check_dsm (acpi_handle handle,const guid_t *guid,u64 rev,u64 funcs);union acpi_object *acpi_evaluate_dsm (acpi_handle handle,const guid_t *guid,u64 rev,u64 func,union acpi_object *argv4); - +#ifdef CONFIG_ACPI static inline union acpi_object * acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev, u64 func, union acpi_object *argv4,
include/acpi/acpi_bus.h acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
Quoted 8 lines
include/acpi/acpi_bus.h +1
-1@@ -68,6 +68,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,return obj; } +#endif #define ACPI_INIT_DSM_ARGV4 (cnt, eles) \ { \ --
Applied (with some edits in the subject and changelog) as 6.4 material, thanks!