From patchwork Tue Dec 8 08:49:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11958017 X-Patchwork-Delegate: kvalo@adurom.com 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 E0BF4C1B0D9 for ; Tue, 8 Dec 2020 08:50:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AD6F23A7E for ; Tue, 8 Dec 2020 08:50:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728325AbgLHIua (ORCPT ); Tue, 8 Dec 2020 03:50:30 -0500 Received: from ozlabs.org ([203.11.71.1]:60591 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725927AbgLHIua (ORCPT ); Tue, 8 Dec 2020 03:50:30 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Cqv4q2vXrz9sWK; Tue, 8 Dec 2020 19:49:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607417387; bh=m50Uy9hZiiibvZwbvLRlzopRh9M4axzuEr+t92E0AW0=; h=Date:From:To:Cc:Subject:From; b=q+7saXO5Plf/h5DonDEbRrA4oO7G3oool0uv1pt8FNgE8QAEeoGNqACpl3PkjaKGJ 5UqrpOBcLOJ27uX2wPDfHqeBJmaho8GyZRLc1Fzqv0/7+WVQ7C5BWw2hikjoH5QVv+ hb1J33NjF7DJ9MlTelKrdw7uFzaJu5X55AV3/1lCQEKcMzRmgnJBRW/eUiKl8ZYfDY 7x4EIucPo81hVt8nIX8KE+oAym3mBjvNSkj4kn+VT3A9cFzTmr5OrXErt+1pyn92dW zQ0V11Lpeh5PQEqwrCsMlJuDMRy2HK/zEFa4O9YtXcDYj7KUphBkTGvaNMAbVCZEiw LawUXFfMU4ZGg== Date: Tue, 8 Dec 2020 19:49:43 +1100 From: Stephen Rothwell To: Kalle Valo , Wireless Cc: Lee Jones , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the wireless-drivers-next tree Message-ID: <20201208194944.19ee46f4@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi all, After merging the wireless-drivers-next tree, today's linux-next build (powerpc allyesconfig) failed like this: ld: drivers/net/wireless/realtek/rtw88/rtw8822ce.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here ld: drivers/net/wireless/realtek/rtw88/rtw8723de.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here ld: drivers/net/wireless/realtek/rtw88/rtw8821ce.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here ld: drivers/net/wireless/realtek/rtw88/pci.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here Caused by commit 2e86ef413ab3 ("rtw88: pci: Add prototypes for .probe, .remove and .shutdown") I have applied the following patch: From: Stephen Rothwell Date: Tue, 8 Dec 2020 19:35:18 +1100 Subject: [PATCH] rtw88: pci: "extern" is necessary for header declarations of data Fixes: 2e86ef413ab3 ("rtw88: pci: Add prototypes for .probe, .remove and .shutdown") Signed-off-by: Stephen Rothwell --- drivers/net/wireless/realtek/rtw88/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/pci.h b/drivers/net/wireless/realtek/rtw88/pci.h index cda56919a5f0..7cdefe229824 100644 --- a/drivers/net/wireless/realtek/rtw88/pci.h +++ b/drivers/net/wireless/realtek/rtw88/pci.h @@ -214,7 +214,7 @@ struct rtw_pci { void __iomem *mmap; }; -const struct dev_pm_ops rtw_pm_ops; +extern const struct dev_pm_ops rtw_pm_ops; int rtw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id); void rtw_pci_remove(struct pci_dev *pdev);