* [PATCH] powerpc/pci: Fix build with PCI_IOV=y and EEH=n
@ 2016-07-05 4:13 Michael Ellerman
2016-07-05 4:30 ` Russell Currey
0 siblings, 1 reply; 3+ messages in thread
From: Michael Ellerman @ 2016-07-05 4:13 UTC (permalink / raw)
To: linuxppc-dev
Despite attempting to fix this in commit fb36e9073693 ("powerpc/pci: Fix
SRIOV not building without EEH enabled"), the build is still broken when
PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):
arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable ‘edev’
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/pci_dn.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index bfe60a1e70d9..e056c9e7b474 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -227,7 +227,9 @@ void remove_dev_pci_data(struct pci_dev *pdev)
#ifdef CONFIG_PCI_IOV
struct pci_dn *parent;
struct pci_dn *pdn, *tmp;
+#ifdef CONFIG_EEH
struct eeh_dev *edev;
+#endif
int i;
/*
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] powerpc/pci: Fix build with PCI_IOV=y and EEH=n
2016-07-05 4:13 [PATCH] powerpc/pci: Fix build with PCI_IOV=y and EEH=n Michael Ellerman
@ 2016-07-05 4:30 ` Russell Currey
2016-07-05 5:16 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 3+ messages in thread
From: Russell Currey @ 2016-07-05 4:30 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev
On Tue, 2016-07-05 at 14:13 +1000, Michael Ellerman wrote:
> Despite attempting to fix this in commit fb36e9073693 ("powerpc/pci: Fix
> SRIOV not building without EEH enabled"), the build is still broken when
> PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):
>
> arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
> arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable ‘edev’
>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> ---
Mistakes were made.
Acked-by: Russell Currey <ruscur@russell.cc>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] powerpc/pci: Fix build with PCI_IOV=y and EEH=n
2016-07-05 4:30 ` Russell Currey
@ 2016-07-05 5:16 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2016-07-05 5:16 UTC (permalink / raw)
To: Russell Currey, Michael Ellerman, linuxppc-dev
On Tue, 2016-07-05 at 14:30 +1000, Russell Currey wrote:
> On Tue, 2016-07-05 at 14:13 +1000, Michael Ellerman wrote:
> > Despite attempting to fix this in commit fb36e9073693
> ("powerpc/pci: Fix
> > SRIOV not building without EEH enabled"), the build is still broken
> when
> > PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):
> >
> > arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
> > arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable
> ‘edev’
> >
> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> > ---
>
> Mistakes were made.
The fix [PATCH 40/41] powerpc/pci: Fix build of Book3E/64 without EEH
in my series should subsume this... provided I didnt screw up that is
:-)
Cheers,
Ben.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-05 5:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-05 4:13 [PATCH] powerpc/pci: Fix build with PCI_IOV=y and EEH=n Michael Ellerman
2016-07-05 4:30 ` Russell Currey
2016-07-05 5:16 ` Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).