• Mauro Rossi's avatar
    firmware: fix build errors in paged buffer handling code · c8917b8f
    Mauro Rossi authored
    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: 5342e709 ("firmware: Factor out the paged buffer handling code")
    Fixes: 82fd7a81 ("firmware: Add support for loading compressed files")
    Signed-off-by: default avatarMauro Rossi <issor.oruam@gmail.com>
    Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
    Link: https://lore.kernel.org/r/20190722055536.15342-1-tiwai@suse.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    c8917b8f
firmware.h 4.01 KB