]> git.baikalelectronics.ru Git - kernel.git/commit
firmware: fix build errors in paged buffer handling code
authorMauro Rossi <issor.oruam@gmail.com>
Mon, 22 Jul 2019 05:55:36 +0000 (07:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jul 2019 06:44:40 +0000 (08:44 +0200)
commite6d7395c45a067bfe57c3a5c62771fa1e8f90d33
tree0ffa4996c3bac1ba54cba05fdae0fdbeb1b03f4e
parent3946fc9291da929ed6836ab79a3b87c34d142954
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: c1aa52eb1138 ("firmware: Factor out the paged buffer handling code")
Fixes: 4a02dcfa970d ("firmware: Add support for loading compressed files")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20190722055536.15342-1-tiwai@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/firmware_loader/firmware.h