From: Bjorn Helgaas <bhelgaas@google.com>
To: Keith Busch <keith.busch@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next list <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the pci tree
Date: Wed, 26 Sep 2018 14:48:10 -0500 [thread overview]
Message-ID: <CAErSpo6CAMrNafXPcdkYRgZsNtBj+zOdWoAKqG2r5h-jDCaVJQ@mail.gmail.com> (raw)
In-Reply-To: <20180926145820.GA14688@localhost.localdomain>
On Wed, Sep 26, 2018 at 9:56 AM Keith Busch <keith.busch@intel.com> wrote:
>
> On Wed, Sep 26, 2018 at 08:25:40AM -0600, Keith Busch wrote:
> > On Wed, Sep 26, 2018 at 03:00:51PM +1000, Stephen Rothwell wrote:
> > > Hi Bjorn,
> > >
> > > After merging the pci tree, today's linux-next build (powerpc allnoconfig)
> > > failed like this:
> > >
> > > ld: drivers/pci/pci.o: in function `pci_bus_error_reset':
> > > pci.c:(.text+0x5fba): undefined reference to `pci_slot_mutex'
> > > ld: pci.c:(.text+0x5fc2): undefined reference to `pci_slot_mutex'
> > >
> > > Caused by commit
> > >
> > > 131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> > >
> > > I have applied the following hack for today (there is probably a better
> > > way):
> >
> > Thanks for the notice. Does this mean you don't have CONFIG_SYSFS? I
> > must admit I missed that connection for building slot.c.
> >
> >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Wed, 26 Sep 2018 14:55:37 +1000
> > > Subject: [PATCH] pci: move pci_slot_mutex so it is available where needed
> > >
> > > Fixes: 131b0ca2c7b2 ("PCI/ERR: Use slot reset if available")
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > drivers/pci/pci.c | 2 ++
> > > drivers/pci/slot.c | 1 -
> > > 2 files changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> > > index 8c1e99a637d8..1fa67db6b21e 100644
> > > --- a/drivers/pci/pci.c
> > > +++ b/drivers/pci/pci.c
> > > @@ -5190,6 +5190,8 @@ static int pci_bus_reset(struct pci_bus *bus, int probe)
> > > return ret;
> > > }
> > >
> > > +DEFINE_MUTEX(pci_slot_mutex);
> > > +
> > > /**
> > > * pci_bus_error_reset - reset the bridge's subordinate bus
> > > * @bridge: The parent device that connects to the bus to reset
> > > diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
> > > index 3da03fcc6fbf..c46d5e1ff536 100644
> > > --- a/drivers/pci/slot.c
> > > +++ b/drivers/pci/slot.c
> > > @@ -14,7 +14,6 @@
> > >
> > > struct kset *pci_slots_kset;
> > > EXPORT_SYMBOL_GPL(pci_slots_kset);
> > > -DEFINE_MUTEX(pci_slot_mutex);
> > >
> > > static ssize_t pci_slot_attr_show(struct kobject *kobj,
> > > struct attribute *attr, char *buf)
> > > --
> > > 2.18.0
>
> There's unfortunately second bug here when there are no slots, which
> would be the case without CONFIG_SYSFS: the slot list is empty, and the
> function just returned success, but it should have gone to the default
> secondary bus reset behavior in that case. I'll send a patch shortly.
I folded in Keith's patch for this, so you should be able to drop your
workaround, Stephen.
next prev parent reply other threads:[~2018-09-26 19:48 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-26 5:00 linux-next: build failure after merge of the pci tree Stephen Rothwell
2018-09-26 14:25 ` Keith Busch
2018-09-26 14:58 ` Keith Busch
2018-09-26 19:48 ` Bjorn Helgaas [this message]
2018-09-26 21:27 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 5:14 Stephen Rothwell
2023-10-24 11:01 ` Ilpo Järvinen
2023-10-23 0:05 Stephen Rothwell
2023-10-23 7:30 ` Yoshihiro Shimoda
2023-10-23 7:34 ` Krzysztof Wilczyński
2023-10-23 9:36 ` Yoshihiro Shimoda
2023-10-23 12:56 ` Krzysztof Wilczyński
2023-10-06 0:56 Stephen Rothwell
2023-10-06 1:23 ` Mario Limonciello
2023-10-06 14:11 ` Bjorn Helgaas
2023-01-15 22:53 Stephen Rothwell
2023-01-18 21:34 ` Bjorn Helgaas
2021-11-04 22:56 Stephen Rothwell
2021-10-17 22:55 Stephen Rothwell
2021-10-18 14:26 ` Bjorn Helgaas
2021-10-10 23:12 Stephen Rothwell
2021-10-11 5:37 ` Manivannan Sadhasivam
2021-10-11 11:22 ` Lorenzo Pieralisi
2020-08-03 1:36 Stephen Rothwell
2020-07-22 1:39 Stephen Rothwell
2020-03-13 1:54 Stephen Rothwell
2020-03-09 23:07 Stephen Rothwell
2020-03-10 19:10 ` Bjorn Helgaas
2019-08-30 3:23 Stephen Rothwell
2019-08-30 12:30 ` Bjorn Helgaas
2019-08-31 4:21 ` Vidya Sagar
2019-08-31 8:49 ` Lorenzo Pieralisi
2019-08-31 14:40 ` Bjorn Helgaas
2019-08-31 16:49 ` Vidya Sagar
2018-03-26 1:31 Stephen Rothwell
2018-03-26 19:53 ` Bjorn Helgaas
2018-03-27 16:53 ` Rob Herring
2018-01-31 23:51 Stephen Rothwell
2018-02-01 8:56 ` Niklas Cassel
2018-02-01 11:10 ` Lorenzo Pieralisi
2018-02-01 11:16 ` Niklas Cassel
2018-02-01 11:22 ` Kishon Vijay Abraham I
2018-02-01 11:29 ` Niklas Cassel
2018-02-01 19:00 ` Bjorn Helgaas
2018-02-01 21:13 ` Stephen Rothwell
2018-01-25 5:49 Stephen Rothwell
2018-01-25 13:55 ` Rob Herring
2018-01-25 14:58 ` Bjorn Helgaas
2018-01-29 4:41 ` Michael Ellerman
2016-04-26 1:13 Stephen Rothwell
2016-04-26 10:05 ` Joerg Roedel
2016-04-22 0:48 Stephen Rothwell
2016-01-11 1:42 Stephen Rothwell
2016-01-11 6:34 ` Bjorn Helgaas
2015-11-01 15:23 Stephen Rothwell
2015-11-02 0:00 ` Ley Foon Tan
2015-11-02 18:12 ` Bjorn Helgaas
2015-11-03 8:02 ` Ley Foon Tan
2015-11-02 0:09 ` Ley Foon Tan
2014-06-11 2:02 Stephen Rothwell
2014-06-11 2:23 ` Bjorn Helgaas
2014-05-22 4:09 Stephen Rothwell
2014-05-22 6:49 ` Sebastian Ott
2014-05-22 16:58 ` Bjorn Helgaas
2012-11-06 0:27 Stephen Rothwell
2012-11-06 1:55 ` Greg Kroah-Hartman
2012-11-06 2:09 ` Stephen Rothwell
2012-11-06 22:01 ` Bjorn Helgaas
2012-09-11 1:29 Stephen Rothwell
2012-09-11 14:28 ` Bjorn Helgaas
2012-02-13 2:21 Stephen Rothwell
2012-02-14 16:45 ` Jesse Barnes
2011-12-06 0:18 Stephen Rothwell
2011-12-06 3:16 ` Bjorn Helgaas
2011-12-06 17:28 ` Jesse Barnes
2011-10-25 13:44 Stephen Rothwell
2011-10-25 17:14 ` Myron Stowe
2011-10-25 19:58 ` Stephen Rothwell
[not found] <20110110125411.2f45fd2f.sfr@canb.auug.org.au>
2011-01-11 15:18 ` Narendra_K
2011-01-11 23:12 ` Stephen Rothwell
2010-10-18 2:20 Stephen Rothwell
2010-10-18 3:02 ` Jesse Barnes
2010-02-09 0:54 Stephen Rothwell
2010-02-09 16:27 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAErSpo6CAMrNafXPcdkYRgZsNtBj+zOdWoAKqG2r5h-jDCaVJQ@mail.gmail.com \
--to=bhelgaas@google.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).