From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] PCI fixes for 2.5.73
Date: Mon, 23 Jun 2003 16:59:10 -0700 [thread overview]
Message-ID: <20030623235910.GB12207@kroah.com> (raw)
In-Reply-To: <20030623235852.GA12207@kroah.com>
ChangeSet 1.1348.14.1, 2003/06/23 11:44:52-07:00, ink@jurassic.park.msu.ru
[PATCH] PCI: fix non-hotplug build
Current BK won't build when CONFIG_HOTPLUG is not set due to
undefined references to pci_destroy_dev in hotplug.c.
I think it makes sense to not compile hotplug.c in this case at all.
Also, this allows to get rid of several function which are unused
in non-hotplug kernel.
Tested on Alpha.
drivers/pci/Makefile | 5 +++--
drivers/pci/hotplug.c | 13 -------------
drivers/pci/pci-driver.c | 8 ++++++++
3 files changed, 11 insertions(+), 15 deletions(-)
diff -Nru a/drivers/pci/Makefile b/drivers/pci/Makefile
--- a/drivers/pci/Makefile Mon Jun 23 16:54:07 2003
+++ b/drivers/pci/Makefile Mon Jun 23 16:54:07 2003
@@ -3,14 +3,15 @@
#
obj-y += access.o bus.o probe.o pci.o pool.o quirks.o \
- names.o pci-driver.o search.o hotplug.o \
- pci-sysfs.o
+ names.o pci-driver.o search.o pci-sysfs.o
obj-$(CONFIG_PM) += power.o
obj-$(CONFIG_PROC_FS) += proc.o
ifndef CONFIG_SPARC64
obj-$(CONFIG_PCI) += setup-res.o
endif
+
+obj-$(CONFIG_HOTPLUG) += hotplug.o
# Build the PCI Hotplug drivers if we were asked to
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
diff -Nru a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
--- a/drivers/pci/hotplug.c Mon Jun 23 16:54:07 2003
+++ b/drivers/pci/hotplug.c Mon Jun 23 16:54:07 2003
@@ -12,7 +12,6 @@
static void pci_free_resources(struct pci_dev *dev);
-#ifdef CONFIG_HOTPLUG
int pci_hotplug (struct device *dev, char **envp, int num_envp,
char *buffer, int buffer_size)
{
@@ -209,16 +208,6 @@
}
EXPORT_SYMBOL(pci_remove_device_safe);
-#else /* CONFIG_HOTPLUG */
-
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
- char *buffer, int buffer_size)
-{
- return -ENODEV;
-}
-
-#endif /* CONFIG_HOTPLUG */
-
static void
pci_free_resources(struct pci_dev *dev)
{
@@ -283,7 +272,5 @@
}
}
-#ifdef CONFIG_HOTPLUG
EXPORT_SYMBOL(pci_remove_bus_device);
EXPORT_SYMBOL(pci_remove_behind_bridge);
-#endif
diff -Nru a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
--- a/drivers/pci/pci-driver.c Mon Jun 23 16:54:07 2003
+++ b/drivers/pci/pci-driver.c Mon Jun 23 16:54:07 2003
@@ -486,6 +486,14 @@
put_device(&dev->dev);
}
+#ifndef CONFIG_HOTPLUG
+int pci_hotplug (struct device *dev, char **envp, int num_envp,
+ char *buffer, int buffer_size)
+{
+ return -ENODEV;
+}
+#endif
+
struct bus_type pci_bus_type = {
.name = "pci",
.match = pci_bus_match,
next prev parent reply other threads:[~2003-06-23 23:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-23 23:58 [BK PATCH] PCI fixes for 2.5.73 Greg KH
2003-06-23 23:59 ` Greg KH [this message]
2003-06-23 23:59 ` [PATCH] " Greg KH
2003-06-23 23:59 ` Greg KH
2003-06-23 23:59 ` Greg KH
2003-06-23 23:59 ` Greg KH
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=20030623235910.GB12207@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.