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=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 A0D4FC76188 for ; Mon, 22 Jul 2019 12:12:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 634552190D for ; Mon, 22 Jul 2019 12:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563797527; bh=qLldPsyd6yf9Fdsf6QSRwxLHpVsOjUD+VEFS6MJ1y4M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=rwRWKGYDc2eaDLTu+k/byF7P4Rdq1KQkuKwSCYhdG3A9vHJnc3aT1l2aB8wCUuVR9 PHK154hnWGj34SklN55PH+1gid3zwhFzxsJR1tnxIrtNuKEGGjmjwyAfG0inlH/nck r1/9r0k5pZ7Vf5LV+pdJdjWVObfZzLi7bte7N12E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730235AbfGVMMG (ORCPT ); Mon, 22 Jul 2019 08:12:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:54484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728413AbfGVMMG (ORCPT ); Mon, 22 Jul 2019 08:12:06 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DFCC42190D; Mon, 22 Jul 2019 12:12:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563797525; bh=qLldPsyd6yf9Fdsf6QSRwxLHpVsOjUD+VEFS6MJ1y4M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dWnCDwmoAqmV22KdM2O5bWGr+S2fKb+oj7IzqcNdYX5aPQtjDFfTtXXc2385Pk5Rg JuOD5wvsDpJRguWWJoSqSqlV5IuQaaKeZNwOQZMNq3Nx7PEBlshRGWTWwzZz7cyqIr Zdf4TlZqDBExtgmKfb5UEcJjKyRoRGO1SxNNGkyg= Date: Mon, 22 Jul 2019 14:12:02 +0200 From: Greg Kroah-Hartman To: Takashi Iwai 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 Message-ID: <20190722121202.GB31543@kroah.com> References: <20190722055536.15342-1-tiwai@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? thanks, greg k-h