Skip to content

Commit c8917b8

Browse files
maurossigregkh
authored andcommitted
firmware: fix build errors in paged buffer handling code
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 ] Fixes: 5342e70 ("firmware: Factor out the paged buffer handling code") Fixes: 82fd7a8 ("firmware: Add support for loading compressed files") Signed-off-by: Mauro Rossi <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5f9e832 commit c8917b8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/base/firmware_loader/firmware.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed);
141141
int fw_map_paged_buf(struct fw_priv *fw_priv);
142142
#else
143143
static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {}
144-
int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
145-
int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
144+
static int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
145+
static int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
146146
#endif
147147

148148
#endif /* __FIRMWARE_LOADER_H */

0 commit comments

Comments
 (0)