| Message ID | 20201208194944.19ee46f4@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | linux-next: build failure after merge of the wireless-drivers-next tree | expand |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > 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 <sfr@canb.auug.org.au> > 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 <sfr@canb.auug.org.au> > --- > 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; Thanks, just an hour ago I applied an identical patch from Ping: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=91aeaf09a6eed83cae0d0fad20a97699b1c8b812
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);
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 <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au> --- drivers/net/wireless/realtek/rtw88/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)