From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88633C76190 for ; Mon, 22 Jul 2019 12:28:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6685D20838 for ; Mon, 22 Jul 2019 12:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729488AbfGVM2u (ORCPT ); Mon, 22 Jul 2019 08:28:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:53290 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729075AbfGVM2t (ORCPT ); Mon, 22 Jul 2019 08:28:49 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id A384BADFC; Mon, 22 Jul 2019 12:28:48 +0000 (UTC) Date: Mon, 22 Jul 2019 14:28:48 +0200 Message-ID: From: Takashi Iwai To: Greg Kroah-Hartman Cc: Luis Chamberlain , "Rafael J . Wysocki" , Mauro Rossi , Chih-Wei Huang , linux-kernel@vger.kernel.org Subject: Re: [PATCH] firmware: fix build errors in paged buffer handling code In-Reply-To: <20190722121202.GB31543@kroah.com> References: <20190722055536.15342-1-tiwai@suse.de> <20190722121202.GB31543@kroah.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 22 Jul 2019 14:12:02 +0200, Greg Kroah-Hartman wrote: > > 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 > > > > > > 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 > > > Signed-off-by: Takashi Iwai > > > > 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? Well, the compiler would optimize it out, so the binary would be almost same, but it's still ugly to keep the obvious mistake there... If necessary, I'll resubmit a patch on top of the first version to correct that. thanks, Takashi