lkml.org 
[lkml]   [2019]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] firmware: fix build errors in paged buffer handling code
On Mon, Jul 22, 2019 at 01:55:20PM +0200, Takashi Iwai wrote:
> On Mon, 22 Jul 2019 07:55:36 +0200,
> Takashi Iwai wrote:
> >
> > From: Mauro Rossi <issor.oruam@gmail.com>
> >
> > 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: 5342e7093ff2 ("firmware: Factor out the paged buffer handling code")
> > Fixes: 82fd7a8142a1 ("firmware: Add support for loading compressed files")
> > Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
>
> Please discard this one. It's missing the inline, as Mauro already
> suggested in another mail.
>
> Will resubmit the revised one. Sorry for inconvenience.

Ugh, I already applied it, if there is no code difference, can we just
leave what I have already committed in the tree?

thanks,

greg k-h

\
 
 \ /
  Last update: 2019-07-22 14:12    [W:0.042 / U:8.952 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site