Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 26 Sep 2018 15:00:51 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bjorn Helgaas <bhelgaas@google.com>
Cc:     Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Keith Busch <keith.busch@intel.com>
Subject: linux-next: build failure after merge of the pci tree
Message-ID: <20180926150051.6ee97aae@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/+jzMUBKjnSCp_/9ZfBA4qFi"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/+jzMUBKjnSCp_/9ZfBA4qFi
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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):

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 pro=
be)
 	return ret;
 }
=20
+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 @@
=20
 struct kset *pci_slots_kset;
 EXPORT_SYMBOL_GPL(pci_slots_kset);
-DEFINE_MUTEX(pci_slot_mutex);
=20
 static ssize_t pci_slot_attr_show(struct kobject *kobj,
 					struct attribute *attr, char *buf)
--=20
2.18.0

--=20
Cheers,
Stephen Rothwell

--Sig_/+jzMUBKjnSCp_/9ZfBA4qFi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlurEoMACgkQAVBC80lX
0GyJSwf/UtataI4stNRabjHRqCTU/sMvp+cj4DxIMeXYBTg6XKybASEomglGqKUk
EbzeuymNPpg7fbmCFlxQm9AdGDUKVAe5JC7BwLPbkdVGqAId82xzmXAenLn1bTBu
CUXoUBrGVmRNFW9sRa4tYife4lEuQfriNQavme/1JOGLUnwNZrqZbLvT/G5VR6z2
56D2CZt72GcEPCsZ1m9AXPY4XzXaQgWON+7Vd5LFf3mvuI/wHsXXsTv1S6OGCM3f
0JwAEKu41aVIqq6RPwmSCkXVnWL8w/X3oqHk/ld6aHkCSu4IRH6l669a/x8OLpKU
CHI1soIBdaYJCp3PnA7lwkxKF0W1jA==
=j3Zq
-----END PGP SIGNATURE-----

--Sig_/+jzMUBKjnSCp_/9ZfBA4qFi--