firmware: fix build errors in paged buffer handling code
Subsystems (2)
PATCH v2 1/1 firmware: fix build errors in paged buffer handling code
From: Mauro Rossi <[email protected]>
fw_{grow,map}_paged_buf() need to be defined as static inline when CONFIG_FW_LOADER_PAGED_BUF is not enabled, infact fw_free_paged_buf() is also defined as static inline when CONFIG_FW_LOADER_PAGED_BUF is not enabled.
Fixes the following mutiple definition building errors for Android kernel:
drivers/base/firmware_loader/fallback_efi.o: In function `fw_grow_paged_buf':
fallback_efi.c:(.text+0x0): multiple definition of fw_grow_paged_buf' drivers/base/firmware_loader/main.o:(.text+0x73b): first defined here drivers/base/firmware_loader/fallback_efi.o: In function fw_map_paged_buf':
fallback_efi.c:(.text+0xf): multiple definition of `fw_map_paged_buf' drivers/base/firmware_loader/main.o:(.text+0x74a): first defined here
[ slightly corrected the patch description -- tiwai ]
---v1->v2: Fixed the mistakenly dropped inline, as done in Mauro's original
patch
drivers/base/firmware_loader/firmware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/firmware_loader/firmware.h +2 -2
@@ -141,8 +141,8 @@ int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed);int fw_map_paged_buf (struct fw_priv *fw_priv);#else static inline void fw_free_paged_buf (struct fw_priv *fw_priv) {} -int fw_grow_paged_buf (struct fw_priv *fw_priv,int pages_needed) {return -ENXIO ; } -int fw_map_paged_buf (struct fw_priv *fw_priv) {return -ENXIO ; } +static inline int fw_grow_paged_buf (struct fw_priv *fw_priv,int pages_needed) {return -ENXIO ; } +static inline int fw_map_paged_buf (struct fw_priv *fw_priv) {return -ENXIO ; }#endif #endif /* __FIRMWARE_LOADER_H */
Signature · 1 line
2.16.4